diff options
119 files changed, 363 insertions, 299 deletions
@@ -44,7 +44,6 @@ include_rules = [ "+chrome/common/extensions/api/app_runtime.h", "+chrome/common/extensions/api/app_window.h", "+chrome/common/extensions/extension_messages.h", - "+chrome/common/extensions/extension_set.h", "+chrome/common/extensions/manifest_handlers/icons_handler.h", ] diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc index 50cb7d0..75cf195 100644 --- a/apps/app_restore_service.cc +++ b/apps/app_restore_service.cc @@ -16,8 +16,8 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension_set.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #if defined(OS_WIN) #include "win8/util/win8_util.h" @@ -52,10 +52,10 @@ AppRestoreService::AppRestoreService(Profile* profile) void AppRestoreService::HandleStartup(bool should_restore_apps) { ExtensionService* extension_service = ExtensionSystem::Get(profile_)->extension_service(); - const ExtensionSet* extensions = extension_service->extensions(); + const extensions::ExtensionSet* extensions = extension_service->extensions(); ExtensionPrefs* extension_prefs = extension_service->extension_prefs(); - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { const Extension* extension = it->get(); if (extension_prefs->IsExtensionRunning(extension->id())) { diff --git a/chrome/browser/apps/app_url_redirector.cc b/chrome/browser/apps/app_url_redirector.cc index 2588cd8..cfa5ce2 100644 --- a/chrome/browser/apps/app_url_redirector.cc +++ b/chrome/browser/apps/app_url_redirector.cc @@ -11,7 +11,6 @@ #include "chrome/browser/profiles/profile_io_data.h" #include "chrome/common/extensions/api/url_handlers/url_handlers_parser.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/extension_set.h" #include "components/navigation_interception/intercept_navigation_resource_throttle.h" #include "components/navigation_interception/navigation_params.h" #include "content/public/browser/browser_thread.h" @@ -21,6 +20,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/info_map.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "net/url_request/url_request.h" using content::BrowserThread; @@ -101,9 +101,9 @@ AppUrlRedirector::MaybeCreateThrottleFor(net::URLRequest* request, return NULL; } - const ExtensionSet& extensions = + const extensions::ExtensionSet& extensions = profile_io_data->GetExtensionInfoMap()->extensions(); - for (ExtensionSet::const_iterator iter = extensions.begin(); + for (extensions::ExtensionSet::const_iterator iter = extensions.begin(); iter != extensions.end(); ++iter) { const UrlHandlerInfo* handler = diff --git a/chrome/browser/apps/shortcut_manager.cc b/chrome/browser/apps/shortcut_manager.cc index 4d46305..4d2ff6d 100644 --- a/chrome/browser/apps/shortcut_manager.cc +++ b/chrome/browser/apps/shortcut_manager.cc @@ -21,12 +21,12 @@ #include "chrome/browser/ui/web_applications/web_app_ui.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension_set.h" #if defined(OS_MACOSX) #include "apps/app_shim/app_shim_mac.h" @@ -186,8 +186,8 @@ void AppShortcutManager::OnceOffCreateShortcuts() { return; // Create an applications menu shortcut for each app in this profile. - const ExtensionSet* apps = extension_service->extensions(); - for (ExtensionSet::const_iterator it = apps->begin(); + const extensions::ExtensionSet* apps = extension_service->extensions(); + for (extensions::ExtensionSet::const_iterator it = apps->begin(); it != apps->end(); ++it) { if (ShouldCreateShortcutFor(it->get())) web_app::UpdateShortcutInfoAndIconForApp( diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc index e51bfbe..0998d7e 100644 --- a/chrome/browser/autocomplete/extension_app_provider.cc +++ b/chrome/browser/autocomplete/extension_app_provider.cc @@ -22,6 +22,7 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "content/public/browser/notification_source.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "ui/base/l10n/l10n_util.h" ExtensionAppProvider::ExtensionAppProvider( @@ -153,9 +154,9 @@ void ExtensionAppProvider::RefreshAppList() { extension_service(); if (!extension_service) return; // During testing, there is no extension service. - const ExtensionSet* extensions = extension_service->extensions(); + const extensions::ExtensionSet* extensions = extension_service->extensions(); extension_apps_.clear(); - for (ExtensionSet::const_iterator iter = extensions->begin(); + for (extensions::ExtensionSet::const_iterator iter = extensions->begin(); iter != extensions->end(); ++iter) { const extensions::Extension* app = iter->get(); if (!app->ShouldDisplayInAppLauncher()) diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 6ddf213..587b8f5 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -78,6 +78,7 @@ #include "content/public/common/process_type.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" #include "extensions/common/view_type.h" #include "ui/gfx/codec/png_codec.h" @@ -1748,11 +1749,11 @@ namespace { // as identified from a given list of extensions. The caller takes ownership // of the created vector. std::vector<DictionaryValue*>* GetAppInfoFromExtensions( - const ExtensionSet* extensions, + const extensions::ExtensionSet* extensions, ExtensionService* ext_service) { std::vector<DictionaryValue*>* apps_list = new std::vector<DictionaryValue*>(); - for (ExtensionSet::const_iterator ext = extensions->begin(); + for (extensions::ExtensionSet::const_iterator ext = extensions->begin(); ext != extensions->end(); ++ext) { // Only return information about extensions that are actually apps. if ((*ext)->is_app()) { @@ -1819,7 +1820,7 @@ NTPInfoObserver::NTPInfoObserver(AutomationProvider* automation, } // Process enabled extensions. ListValue* apps_list = new ListValue(); - const ExtensionSet* extensions = ext_service->extensions(); + const extensions::ExtensionSet* extensions = ext_service->extensions(); std::vector<DictionaryValue*>* enabled_apps = GetAppInfoFromExtensions( extensions, ext_service); for (std::vector<DictionaryValue*>::const_iterator app = @@ -1829,7 +1830,8 @@ NTPInfoObserver::NTPInfoObserver(AutomationProvider* automation, } delete enabled_apps; // Process disabled extensions. - const ExtensionSet* disabled_extensions = ext_service->disabled_extensions(); + const extensions::ExtensionSet* disabled_extensions = + ext_service->disabled_extensions(); std::vector<DictionaryValue*>* disabled_apps = GetAppInfoFromExtensions( disabled_extensions, ext_service); for (std::vector<DictionaryValue*>::const_iterator app = @@ -1839,7 +1841,7 @@ NTPInfoObserver::NTPInfoObserver(AutomationProvider* automation, } delete disabled_apps; // Process terminated extensions. - const ExtensionSet* terminated_extensions = + const extensions::ExtensionSet* terminated_extensions = ext_service->terminated_extensions(); std::vector<DictionaryValue*>* terminated_apps = GetAppInfoFromExtensions( terminated_extensions, ext_service); diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 527dd71..3844420 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -140,6 +140,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" @@ -3535,8 +3536,9 @@ void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args, } scoped_ptr<DictionaryValue> return_value(new DictionaryValue); ListValue* extensions_values = new ListValue; - const ExtensionSet* extensions = service->extensions(); - const ExtensionSet* disabled_extensions = service->disabled_extensions(); + const extensions::ExtensionSet* extensions = service->extensions(); + const extensions::ExtensionSet* disabled_extensions = + service->disabled_extensions(); ExtensionList all; all.insert(all.end(), extensions->begin(), diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index 13a8b88..3edf342 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -29,6 +29,7 @@ #include "content/public/browser/notification_source.h" #include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/permissions/permission_set.h" #include "ui/base/l10n/l10n_util_collator.h" @@ -88,9 +89,9 @@ class BackgroundApplicationListModel::Application namespace { void GetServiceApplications(ExtensionService* service, ExtensionList* applications_result) { - const ExtensionSet* extensions = service->extensions(); + const extensions::ExtensionSet* extensions = service->extensions(); - for (ExtensionSet::const_iterator cursor = extensions->begin(); + for (extensions::ExtensionSet::const_iterator cursor = extensions->begin(); cursor != extensions->end(); ++cursor) { const Extension* extension = cursor->get(); @@ -103,7 +104,7 @@ void GetServiceApplications(ExtensionService* service, // Walk the list of terminated extensions also (just because an extension // crashed doesn't mean we should ignore it). extensions = service->terminated_extensions(); - for (ExtensionSet::const_iterator cursor = extensions->begin(); + for (extensions::ExtensionSet::const_iterator cursor = extensions->begin(); cursor != extensions->end(); ++cursor) { const Extension* extension = cursor->get(); diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc index 9b854f8..f0cfc80 100644 --- a/chrome/browser/background/background_contents_service.cc +++ b/chrome/browser/background/background_contents_service.cc @@ -42,6 +42,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -582,10 +583,11 @@ void BackgroundContentsService::LoadBackgroundContentsFromDictionary( void BackgroundContentsService::LoadBackgroundContentsFromManifests( Profile* profile) { - const ExtensionSet* extensions = extensions::ExtensionSystem::Get(profile)-> - extension_service()->extensions(); - ExtensionSet::const_iterator iter = extensions->begin(); - for (; iter != extensions->end(); ++iter) { + const extensions::ExtensionSet* extensions = + extensions::ExtensionSystem::Get(profile)-> + extension_service()->extensions(); + for (extensions::ExtensionSet::const_iterator iter = extensions->begin(); + iter != extensions->end(); ++iter) { const Extension* extension = iter->get(); if (extension->is_hosted_app() && BackgroundInfo::HasBackgroundPage(extension)) { diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc index 407e2d7..184d587 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.cc +++ b/chrome/browser/browsing_data/cookies_tree_model.cc @@ -19,6 +19,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" #include "content/public/common/url_constants.h" +#include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" @@ -956,7 +957,7 @@ void CookiesTreeModel::UpdateSearchResults(const base::string16& filter) { PopulateServerBoundCertInfoWithFilter(data_container(), ¬ifier, filter); } -const ExtensionSet* CookiesTreeModel::ExtensionsProtectingNode( +const extensions::ExtensionSet* CookiesTreeModel::ExtensionsProtectingNode( const CookieTreeNode& cookie_node) { if (!special_storage_policy_.get()) return NULL; diff --git a/chrome/browser/browsing_data/cookies_tree_model.h b/chrome/browser/browsing_data/cookies_tree_model.h index eb5c6cf..106a8fe 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.h +++ b/chrome/browser/browsing_data/cookies_tree_model.h @@ -25,7 +25,6 @@ #include "chrome/browser/browsing_data/browsing_data_quota_helper.h" #include "chrome/browser/browsing_data/local_data_container.h" #include "chrome/common/content_settings.h" -#include "chrome/common/extensions/extension_set.h" #include "net/ssl/server_bound_cert_store.h" #include "ui/base/models/tree_node_model.h" @@ -54,6 +53,10 @@ class CookieTreeSessionStorageNode; class CookieTreeSessionStoragesNode; class ExtensionSpecialStoragePolicy; +namespace extensions { +class ExtensionSet; +} + namespace net { class CanonicalCookie; } @@ -641,7 +644,7 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> { // this node from deletion. // Returns NULL if the node doesn't represent a protected data item or the // special storage policy is NULL. - const ExtensionSet* ExtensionsProtectingNode( + const extensions::ExtensionSet* ExtensionsProtectingNode( const CookieTreeNode& cookie_node); // Manages CookiesTreeModel::Observers. This will also call diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 5023718..e25a503 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -90,7 +90,6 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/env_vars.h" #include "chrome/common/extensions/extension_process_policy.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" #include "chrome/common/extensions/permissions/socket_permission.h" #include "chrome/common/extensions/web_accessible_resources_handler.h" @@ -128,6 +127,7 @@ #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/shared_module_info.h" #include "extensions/common/permissions/permissions_data.h" @@ -1898,11 +1898,11 @@ void ChromeContentBrowserClient::RequestDesktopNotificationPermission( DesktopNotificationServiceFactory::GetForProfile(profile); const Extension* extension = NULL; if (extension_info_map) { - ExtensionSet extensions; + extensions::ExtensionSet extensions; extension_info_map->GetExtensionsWithAPIPermissionForSecurityOrigin( source_origin, render_process_id, extensions::APIPermission::kNotification, &extensions); - for (ExtensionSet::const_iterator iter = extensions.begin(); + for (extensions::ExtensionSet::const_iterator iter = extensions.begin(); iter != extensions.end(); ++iter) { if (notification_service->IsNotifierEnabled(NotifierId( NotifierId::APPLICATION, (*iter)->id()))) { @@ -1941,11 +1941,11 @@ blink::WebNotificationPresenter::Permission // We want to see if there is an extension that hasn't been manually disabled // that has the notifications permission and applies to this security origin. // First, get the list of extensions with permission for the origin. - ExtensionSet extensions; + extensions::ExtensionSet extensions; extension_info_map->GetExtensionsWithAPIPermissionForSecurityOrigin( source_origin, render_process_id, extensions::APIPermission::kNotification, &extensions); - for (ExtensionSet::const_iterator iter = extensions.begin(); + for (extensions::ExtensionSet::const_iterator iter = extensions.begin(); iter != extensions.end(); ++iter) { // Then, check to see if it's been disabled by the user. if (!extension_info_map->AreNotificationsDisabled((*iter)->id())) @@ -2430,7 +2430,7 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI( const content::SocketPermissionRequest* params) { #if defined(ENABLE_PLUGINS) Profile* profile = Profile::FromBrowserContext(browser_context); - const ExtensionSet* extension_set = NULL; + const extensions::ExtensionSet* extension_set = NULL; if (profile) { extension_set = extensions::ExtensionSystem::Get(profile)-> extension_service()->extensions(); @@ -2614,7 +2614,7 @@ bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( const GURL& url) { #if defined(ENABLE_PLUGINS) Profile* profile = Profile::FromBrowserContext(browser_context); - const ExtensionSet* extension_set = NULL; + const extensions::ExtensionSet* extension_set = NULL; if (profile) { extension_set = extensions::ExtensionSystem::Get(profile)-> extension_service()->extensions(); diff --git a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc index 4382b18..c1581bf 100644 --- a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc +++ b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc @@ -27,6 +27,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/event_router.h" #include "extensions/browser/lazy_background_task_queue.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" #include "net/base/escape.h" #include "webkit/browser/fileapi/file_system_context.h" @@ -101,9 +102,9 @@ FileBrowserHandlerList FindFileBrowserHandlersForURL( const GURL lowercase_url(EscapedUtf8ToLower(selected_file_url.spec())); FileBrowserHandlerList results; - for (ExtensionSet::const_iterator iter = service->extensions()->begin(); - iter != service->extensions()->end(); - ++iter) { + for (extensions::ExtensionSet::const_iterator iter = + service->extensions()->begin(); + iter != service->extensions()->end(); ++iter) { const Extension* extension = iter->get(); if (profile->IsOffTheRecord() && !extension_util::IsIncognitoEnabled(extension->id(), service)) diff --git a/chrome/browser/chromeos/file_manager/file_tasks.cc b/chrome/browser/chromeos/file_manager/file_tasks.cc index 1bfc78d..22ea8cf 100644 --- a/chrome/browser/chromeos/file_manager/file_tasks.cc +++ b/chrome/browser/chromeos/file_manager/file_tasks.cc @@ -27,6 +27,7 @@ #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h" #include "chrome/common/pref_names.h" +#include "extensions/common/extension_set.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_url.h" @@ -389,7 +390,8 @@ void FindFileHandlerTasks( if (!service) return; - for (ExtensionSet::const_iterator iter = service->extensions()->begin(); + for (extensions::ExtensionSet::const_iterator iter = + service->extensions()->begin(); iter != service->extensions()->end(); ++iter) { const Extension* extension = iter->get(); diff --git a/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc b/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc index 6da056f..dca45b4 100644 --- a/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc +++ b/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc @@ -13,9 +13,9 @@ #include "chrome/browser/sync/about_sync_util.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" namespace { @@ -100,8 +100,8 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs( return; std::string extensions_list; - const ExtensionSet* extensions = service->extensions(); - for (ExtensionSet::const_iterator it = extensions->begin(); + const extensions::ExtensionSet* extensions = service->extensions(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { const extensions::Extension* extension = it->get(); diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc index 59f5d33..d1c977f 100644 --- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc +++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc @@ -12,13 +12,13 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/features/simple_feature.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" using extensions::UnloadedExtensionInfo; @@ -28,8 +28,8 @@ InternalExtensionProvider::InternalExtensionProvider( ExtensionService* extension_service) : registrar_(new content::NotificationRegistrar) { // Whitelist all extensions loaded so far. - const ExtensionSet* extensions = extension_service->extensions(); - for (ExtensionSet::const_iterator it = extensions->begin(); + const extensions::ExtensionSet* extensions = extension_service->extensions(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { if (extensions::PluginInfo::HasPlugins(it->get())) SetContentSettingForExtension(it->get(), CONTENT_SETTING_ALLOW); diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index 9740c73..254a004 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -65,6 +65,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/url_constants.h" +#include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -1472,10 +1473,10 @@ void DevToolsWindow::AddDevToolsExtensionsToClient() { profile->GetOriginalProfile())->extension_service(); if (!extension_service) return; - const ExtensionSet* extensions = extension_service->extensions(); + const extensions::ExtensionSet* extensions = extension_service->extensions(); ListValue results; - for (ExtensionSet::const_iterator extension(extensions->begin()); + for (extensions::ExtensionSet::const_iterator extension(extensions->begin()); extension != extensions->end(); ++extension) { if (extensions::ManifestURL::GetDevToolsPage(extension->get()).is_empty()) continue; diff --git a/chrome/browser/extensions/active_tab_permission_granter.h b/chrome/browser/extensions/active_tab_permission_granter.h index fe43fb8..07d7154 100644 --- a/chrome/browser/extensions/active_tab_permission_granter.h +++ b/chrome/browser/extensions/active_tab_permission_granter.h @@ -8,10 +8,10 @@ #include <set> #include <string> -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/common/extension_set.h" #include "extensions/common/url_pattern_set.h" class Profile; diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index 4037c53..7b32223 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -52,6 +52,7 @@ #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension_resource.h" +#include "extensions/common/extension_set.h" #include "extensions/common/install_warning.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/incognito_info.h" @@ -130,10 +131,10 @@ bool ValidateFolderName(const base::FilePath::StringType& name) { return name == name_sanitized; } -const Extension* GetExtensionByPath(const ExtensionSet* extensions, +const Extension* GetExtensionByPath(const extensions::ExtensionSet* extensions, const base::FilePath& path) { base::FilePath extension_path = base::MakeAbsoluteFilePath(path); - for (ExtensionSet::const_iterator iter = extensions->begin(); + for (extensions::ExtensionSet::const_iterator iter = extensions->begin(); iter != extensions->end(); ++iter) { if ((*iter)->path() == extension_path) return iter->get(); @@ -529,7 +530,7 @@ bool DeveloperPrivateGetItemsInfoFunction::RunImpl() { bool include_disabled = params->include_disabled; bool include_terminated = params->include_terminated; - ExtensionSet items; + extensions::ExtensionSet items; ExtensionService* service = GetProfile()->GetExtensionService(); @@ -546,7 +547,7 @@ bool DeveloperPrivateGetItemsInfoFunction::RunImpl() { std::map<std::string, ExtensionResource> id_to_icon; ItemInfoList item_list; - for (ExtensionSet::const_iterator iter = items.begin(); + for (extensions::ExtensionSet::const_iterator iter = items.begin(); iter != items.end(); ++iter) { const Extension& item = *iter->get(); @@ -1135,7 +1136,7 @@ bool DeveloperPrivateLoadProjectFunction::RunImpl() { ExtensionService* service = GetProfile()->GetExtensionService(); UnpackedInstaller::Create(service)->Load(path); - const ExtensionSet* extensions = service->extensions(); + const extensions::ExtensionSet* extensions = service->extensions(); // Released by GetUnpackedExtension. AddRef(); content::BrowserThread::PostTask(content::BrowserThread::FILE, FROM_HERE, @@ -1146,7 +1147,7 @@ bool DeveloperPrivateLoadProjectFunction::RunImpl() { void DeveloperPrivateLoadProjectFunction::GetUnpackedExtension( const base::FilePath& path, - const ExtensionSet* extensions) { + const extensions::ExtensionSet* extensions) { const Extension* extension = GetExtensionByPath(extensions, path); bool success = true; if (extension) { diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc index 6c7b0e9..5e6a0b3 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc @@ -25,7 +25,6 @@ #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/extensions/api/push_messaging.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc index 8611c89..f86684c 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc @@ -13,9 +13,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/render_view_host.h" +#include "extensions/common/extension_set.h" #include "net/dns/mock_host_resolver.h" namespace { diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc index 2221376..7e3aa58 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc @@ -24,7 +24,6 @@ #include "chrome/browser/value_store/value_store_change.h" #include "chrome/common/extensions/api/storage.h" #include "chrome/common/extensions/api/storage/storage_schema_manifest_handler.h" -#include "chrome/common/extensions/extension_set.h" #include "components/policy/core/common/policy_namespace.h" #include "components/policy/core/common/schema.h" #include "components/policy/core/common/schema_map.h" @@ -36,6 +35,7 @@ #include "content/public/browser/notification_source.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/one_shot_event.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index e104f92..e4461ee 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -53,6 +53,7 @@ #include "extensions/common/error_utils.h" #include "extensions/common/event_filtering_info.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/features/feature.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" @@ -2361,9 +2362,9 @@ void SendExtensionWebRequestStatusToHost(content::RenderProcessHost* host) { bool adblock = false; bool adblock_plus = false; bool other = false; - const ExtensionSet* extensions = + const extensions::ExtensionSet* extensions = profile->GetExtensionService()->extensions(); - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { if (profile->GetExtensionService()->HasUsedWebRequest(it->get())) { if ((*it)->name().find("Adblock Plus") != std::string::npos) { diff --git a/chrome/browser/extensions/app_sync_bundle.cc b/chrome/browser/extensions/app_sync_bundle.cc index d8e2cdd..138d11a1 100644 --- a/chrome/browser/extensions/app_sync_bundle.cc +++ b/chrome/browser/extensions/app_sync_bundle.cc @@ -6,10 +6,10 @@ #include "base/location.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/sync_helper.h" #include "extensions/browser/app_sorting.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "sync/api/sync_change_processor.h" #include "sync/api/sync_error_factory.h" diff --git a/chrome/browser/extensions/app_sync_bundle.h b/chrome/browser/extensions/app_sync_bundle.h index 7fa8d17..0b69ac4 100644 --- a/chrome/browser/extensions/app_sync_bundle.h +++ b/chrome/browser/extensions/app_sync_bundle.h @@ -17,7 +17,6 @@ #include "sync/api/syncable_service.h" class ExtensionSyncService; -class ExtensionSet; namespace syncer { class SyncChangeProcessor; @@ -27,6 +26,7 @@ class SyncErrorFactory; namespace extensions { class Extension; +class ExtensionSet; // Bundle of app specific sync stuff. class AppSyncBundle : public SyncBundle { diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc index 64f67d8..ad0624b 100644 --- a/chrome/browser/extensions/component_loader_unittest.cc +++ b/chrome/browser/extensions/component_loader_unittest.cc @@ -11,12 +11,12 @@ #include "base/prefs/pref_registry_simple.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "components/user_prefs/pref_registry_syncable.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc index 9f4c7be..7156622 100644 --- a/chrome/browser/extensions/error_console/error_console.cc +++ b/chrome/browser/extensions/error_console/error_console.cc @@ -17,13 +17,13 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index 79d4711..b08a58a 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -19,6 +19,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "net/base/escape.h" #include "net/base/net_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" @@ -393,7 +394,8 @@ const extensions::Extension* ExtensionApiTest::GetSingleLoadedExtension() { browser()->profile())->extension_service(); const extensions::Extension* extension = NULL; - for (ExtensionSet::const_iterator it = service->extensions()->begin(); + for (extensions::ExtensionSet::const_iterator it = + service->extensions()->begin(); it != service->extensions()->end(); ++it) { // Ignore any component extensions. They are automatically loaded into all // profiles and aren't the extension we're looking for here. diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 863906f..014783f 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -34,7 +34,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" @@ -43,6 +42,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/test/browser_test_utils.h" #include "extensions/common/constants.h" +#include "extensions/common/extension_set.h" #include "sync/api/string_ordinal.h" #if defined(OS_CHROMEOS) @@ -80,10 +80,10 @@ Profile* ExtensionBrowserTest::profile() { // static const Extension* ExtensionBrowserTest::GetExtensionByPath( - const ExtensionSet* extensions, const base::FilePath& path) { + const extensions::ExtensionSet* extensions, const base::FilePath& path) { base::FilePath extension_path = base::MakeAbsoluteFilePath(path); EXPECT_TRUE(!extension_path.empty()); - for (ExtensionSet::const_iterator iter = extensions->begin(); + for (extensions::ExtensionSet::const_iterator iter = extensions->begin(); iter != extensions->end(); ++iter) { if ((*iter)->path() == extension_path) { return iter->get(); @@ -453,7 +453,8 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension( << " num after: " << base::IntToString(num_after) << " Installed extensions follow:"; - for (ExtensionSet::const_iterator it = service->extensions()->begin(); + for (extensions::ExtensionSet::const_iterator it = + service->extensions()->begin(); it != service->extensions()->end(); ++it) VLOG(1) << " " << (*it)->id(); diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h index f70537c..47b37d7 100644 --- a/chrome/browser/extensions/extension_browsertest.h +++ b/chrome/browser/extensions/extension_browsertest.h @@ -23,10 +23,10 @@ #include "extensions/common/manifest.h" class ExtensionService; -class ExtensionSet; class Profile; namespace extensions { +class ExtensionSet; class ProcessManager; } @@ -69,7 +69,7 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest { Profile* profile(); static const extensions::Extension* GetExtensionByPath( - const ExtensionSet* extensions, const base::FilePath& path); + const extensions::ExtensionSet* extensions, const base::FilePath& path); // InProcessBrowserTest virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index 616465a..77bd71f 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc @@ -16,6 +16,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/common/context_menu_params.h" #include "extensions/browser/test_management_policy.h" +#include "extensions/common/extension_set.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" #include "ui/base/models/menu_model.h" @@ -133,10 +134,10 @@ class ExtensionContextMenuBrowserTest : public ExtensionBrowserTest { // Returns a pointer to the currently loaded extension with |name|, or null // if not found. const extensions::Extension* GetExtensionNamed(std::string name) { - const ExtensionSet* extensions = + const extensions::ExtensionSet* extensions = browser()->profile()->GetExtensionService()->extensions(); - ExtensionSet::const_iterator i; - for (i = extensions->begin(); i != extensions->end(); ++i) { + for (extensions::ExtensionSet::const_iterator i = extensions->begin(); + i != extensions->end(); ++i) { if ((*i)->name() == name) { return i->get(); } diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index 1365e4a..807607a 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -23,7 +23,6 @@ #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "chrome/browser/renderer_host/chrome_render_message_filter.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" @@ -35,6 +34,7 @@ #include "extensions/browser/process_map.h" #include "extensions/browser/quota_service.h" #include "extensions/common/extension_api.h" +#include "extensions/common/extension_set.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" #include "webkit/common/resource_type.h" diff --git a/chrome/browser/extensions/extension_keybinding_registry.cc b/chrome/browser/extensions/extension_keybinding_registry.cc index cca0c28..76e1315 100644 --- a/chrome/browser/extensions/extension_keybinding_registry.cc +++ b/chrome/browser/extensions/extension_keybinding_registry.cc @@ -11,8 +11,8 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension_set.h" #include "extensions/browser/event_router.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest_constants.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 9c61f40..b8b68fd 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -113,6 +113,7 @@ using extensions::CrxInstaller; using extensions::Extension; using extensions::ExtensionIdSet; using extensions::ExtensionInfo; +using extensions::ExtensionSet; using extensions::FeatureSwitch; using extensions::InstallVerifier; using extensions::ManagementPolicy; diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index f838465..486f996 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -23,7 +23,6 @@ #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -34,6 +33,7 @@ #include "extensions/browser/process_map.h" #include "extensions/browser/quota_service.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handlers/shared_module_info.h" #include "extensions/common/one_shot_event.h" @@ -72,8 +72,8 @@ class ExtensionServiceInterface : public base::SupportsWeakPtr<ExtensionServiceInterface> { public: virtual ~ExtensionServiceInterface() {} - virtual const ExtensionSet* extensions() const = 0; - virtual const ExtensionSet* disabled_extensions() const = 0; + virtual const extensions::ExtensionSet* extensions() const = 0; + virtual const extensions::ExtensionSet* disabled_extensions() const = 0; virtual extensions::PendingExtensionManager* pending_extension_manager() = 0; // Install an update. Return true if the install can be started. @@ -158,15 +158,15 @@ class ExtensionService virtual ~ExtensionService(); // Gets the list of currently installed extensions. - virtual const ExtensionSet* extensions() const OVERRIDE; - virtual const ExtensionSet* disabled_extensions() const OVERRIDE; - const ExtensionSet* terminated_extensions() const; - const ExtensionSet* blacklisted_extensions() const; - const ExtensionSet* delayed_installs() const; + virtual const extensions::ExtensionSet* extensions() const OVERRIDE; + virtual const extensions::ExtensionSet* disabled_extensions() const OVERRIDE; + const extensions::ExtensionSet* terminated_extensions() const; + const extensions::ExtensionSet* blacklisted_extensions() const; + const extensions::ExtensionSet* delayed_installs() const; // Returns a set of all installed, disabled, blacklisted, and terminated // extensions. - scoped_ptr<ExtensionSet> GenerateInstalledExtensionsSet() const; + scoped_ptr<extensions::ExtensionSet> GenerateInstalledExtensionsSet() const; // Gets the object managing the set of pending extensions. virtual extensions::PendingExtensionManager* @@ -376,7 +376,7 @@ class ExtensionService ImportStatus SatisfyImports(const extensions::Extension* extension); // Returns a set of extensions that import a given extension. - scoped_ptr<const ExtensionSet> GetDependentExtensions( + scoped_ptr<const extensions::ExtensionSet> GetDependentExtensions( const extensions::Extension* extension); // Uninstalls shared modules that were only referenced by |extension|. @@ -734,23 +734,23 @@ class ExtensionService ExtensionSyncService* extension_sync_service_; // The current list of installed extensions. - ExtensionSet extensions_; + extensions::ExtensionSet extensions_; // The list of installed extensions that have been disabled. - ExtensionSet disabled_extensions_; + extensions::ExtensionSet disabled_extensions_; // The list of installed extensions that have been terminated. - ExtensionSet terminated_extensions_; + extensions::ExtensionSet terminated_extensions_; // The list of installed extensions that have been blacklisted. Generally // these shouldn't be considered as installed by the extension platform: we // only keep them around so that if extensions are blacklisted by mistake // they can easily be un-blacklisted. - ExtensionSet blacklisted_extensions_; + extensions::ExtensionSet blacklisted_extensions_; // The list of extension installs delayed for various reasons. The reason // for delayed install is stored in ExtensionPrefs. - ExtensionSet delayed_installs_; + extensions::ExtensionSet delayed_installs_; // Hold the set of pending extensions. extensions::PendingExtensionManager pending_extension_manager_; diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index a0b3c69..4601480 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -3369,8 +3369,8 @@ TEST_F(ExtensionServiceTest, SetUnsetBlacklistInPrefs) { InitializeGoodInstalledExtensionService(); service_->Init(); - const ExtensionSet* extensions = service_->extensions(); - const ExtensionSet* blacklisted_extensions = + const extensions::ExtensionSet* extensions = service_->extensions(); + const extensions::ExtensionSet* blacklisted_extensions = service_->blacklisted_extensions(); EXPECT_TRUE( extensions->Contains(good0) && diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc index 8cf296d..c79049c 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.cc +++ b/chrome/browser/extensions/extension_special_storage_policy.cc @@ -18,6 +18,7 @@ #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" using content::BrowserThread; using extensions::APIPermission; @@ -86,7 +87,8 @@ bool ExtensionSpecialStoragePolicy::NeedsProtection( return extension->is_hosted_app() && !extension->from_bookmark(); } -const ExtensionSet* ExtensionSpecialStoragePolicy::ExtensionsProtectingOrigin( +const extensions::ExtensionSet* +ExtensionSpecialStoragePolicy::ExtensionsProtectingOrigin( const GURL& origin) { base::AutoLock locker(lock_); return protected_apps_.ExtensionsContaining(origin); @@ -229,15 +231,15 @@ bool ExtensionSpecialStoragePolicy::SpecialCollection::Contains( return !ExtensionsContaining(origin)->is_empty(); } -const ExtensionSet* +const extensions::ExtensionSet* ExtensionSpecialStoragePolicy::SpecialCollection::ExtensionsContaining( const GURL& origin) { CachedResults::const_iterator found = cached_results_.find(origin); if (found != cached_results_.end()) return found->second; - ExtensionSet* result = new ExtensionSet(); - for (ExtensionSet::const_iterator iter = extensions_.begin(); + extensions::ExtensionSet* result = new extensions::ExtensionSet(); + for (extensions::ExtensionSet::const_iterator iter = extensions_.begin(); iter != extensions_.end(); ++iter) { if ((*iter)->OverlapsWithOrigin(origin)) result->Insert(*iter); diff --git a/chrome/browser/extensions/extension_special_storage_policy.h b/chrome/browser/extensions/extension_special_storage_policy.h index 494c65a..aa04bd6 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.h +++ b/chrome/browser/extensions/extension_special_storage_policy.h @@ -9,7 +9,7 @@ #include <string> #include "base/synchronization/lock.h" -#include "chrome/common/extensions/extension_set.h" +#include "extensions/common/extension_set.h" #include "url/gurl.h" #include "webkit/browser/quota/special_storage_policy.h" @@ -46,7 +46,8 @@ class ExtensionSpecialStoragePolicy : public quota::SpecialStoragePolicy { // Returns the set of extensions protecting this origin. The caller does not // take ownership of the return value. - const ExtensionSet* ExtensionsProtectingOrigin(const GURL& origin); + const extensions::ExtensionSet* ExtensionsProtectingOrigin( + const GURL& origin); protected: virtual ~ExtensionSpecialStoragePolicy(); @@ -58,18 +59,18 @@ class ExtensionSpecialStoragePolicy : public quota::SpecialStoragePolicy { ~SpecialCollection(); bool Contains(const GURL& origin); - const ExtensionSet* ExtensionsContaining(const GURL& origin); + const extensions::ExtensionSet* ExtensionsContaining(const GURL& origin); bool ContainsExtension(const std::string& extension_id); bool Add(const extensions::Extension* extension); bool Remove(const extensions::Extension* extension); void Clear(); private: - typedef std::map<GURL, ExtensionSet*> CachedResults; + typedef std::map<GURL, extensions::ExtensionSet*> CachedResults; void ClearCache(); - ExtensionSet extensions_; + extensions::ExtensionSet extensions_; CachedResults cached_results_; }; diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc index 71ef27f..104cbcb 100644 --- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc +++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc @@ -11,12 +11,14 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; using extensions::Extension; +using extensions::ExtensionSet; using extensions::Manifest; using quota::SpecialStoragePolicy; diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index f65d666..15404c9 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -26,6 +26,8 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" #include "net/base/net_util.h" @@ -95,7 +97,8 @@ class ExtensionStartupTestBase : public InProcessBrowserTest { // Count the number of non-component extensions. int found_extensions = 0; - for (ExtensionSet::const_iterator it = service->extensions()->begin(); + for (extensions::ExtensionSet::const_iterator it = + service->extensions()->begin(); it != service->extensions()->end(); ++it) if ((*it)->location() != extensions::Manifest::COMPONENT) found_extensions++; @@ -185,7 +188,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_NoFileAccess) { ExtensionService* service = extensions::ExtensionSystem::Get( browser()->profile())->extension_service(); - for (ExtensionSet::const_iterator it = service->extensions()->begin(); + for (extensions::ExtensionSet::const_iterator it = + service->extensions()->begin(); it != service->extensions()->end(); ++it) { if ((*it)->location() == extensions::Manifest::COMPONENT) continue; diff --git a/chrome/browser/extensions/extension_sync_bundle.cc b/chrome/browser/extensions/extension_sync_bundle.cc index 4786091..b313c0e 100644 --- a/chrome/browser/extensions/extension_sync_bundle.cc +++ b/chrome/browser/extensions/extension_sync_bundle.cc @@ -6,9 +6,9 @@ #include "base/location.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/sync_helper.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "sync/api/sync_change_processor.h" #include "sync/api/sync_error_factory.h" diff --git a/chrome/browser/extensions/extension_sync_bundle.h b/chrome/browser/extensions/extension_sync_bundle.h index 3dadc1e..fa805a4 100644 --- a/chrome/browser/extensions/extension_sync_bundle.h +++ b/chrome/browser/extensions/extension_sync_bundle.h @@ -17,7 +17,6 @@ #include "sync/api/syncable_service.h" class ExtensionSyncService; -class ExtensionSet; namespace syncer { class SyncChangeProcessor; @@ -27,6 +26,7 @@ class SyncErrorFactory; namespace extensions { class Extension; +class ExtensionSet; // Bundle of extension specific sync stuff. class ExtensionSyncBundle : public SyncBundle { diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index 40f7957..e180acf 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -25,6 +25,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" using extensions::Extension; @@ -336,7 +337,8 @@ void ExtensionToolbarModel::Populate( extensions::ExtensionActionManager::Get(profile_); // Create the lists. - for (ExtensionSet::const_iterator it = service->extensions()->begin(); + for (extensions::ExtensionSet::const_iterator it = + service->extensions()->begin(); it != service->extensions()->end(); ++it) { const Extension* extension = it->get(); if (!extension_action_manager->GetBrowserAction(*extension)) diff --git a/chrome/browser/extensions/extension_warning_service.h b/chrome/browser/extensions/extension_warning_service.h index 03e8499..0062e53 100644 --- a/chrome/browser/extensions/extension_warning_service.h +++ b/chrome/browser/extensions/extension_warning_service.h @@ -12,7 +12,6 @@ #include "base/observer_list.h" #include "base/threading/non_thread_safe.h" #include "chrome/browser/extensions/extension_warning_set.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc index 7faeef5..1c4df71 100644 --- a/chrome/browser/extensions/extension_warning_set.cc +++ b/chrome/browser/extensions/extension_warning_set.cc @@ -7,9 +7,9 @@ #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/extensions/extension_warning_set.h b/chrome/browser/extensions/extension_warning_set.h index 9e00823..c064664 100644 --- a/chrome/browser/extensions/extension_warning_set.h +++ b/chrome/browser/extensions/extension_warning_set.h @@ -17,10 +17,10 @@ namespace base { class FilePath; } -class ExtensionSet; - namespace extensions { +class ExtensionSet; + // This class is used by the ExtensionWarningService to represent warnings if // extensions misbehave. Note that the ExtensionWarningService deals only with // specific warnings that should trigger a badge on the Chrome menu button. diff --git a/chrome/browser/extensions/page_action_controller.cc b/chrome/browser/extensions/page_action_controller.cc index 8631e70..8919be1 100644 --- a/chrome/browser/extensions/page_action_controller.cc +++ b/chrome/browser/extensions/page_action_controller.cc @@ -15,11 +15,11 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension_set.h" namespace extensions { diff --git a/chrome/browser/extensions/script_badge_controller.cc b/chrome/browser/extensions/script_badge_controller.cc index d701652..5b6411c 100644 --- a/chrome/browser/extensions/script_badge_controller.cc +++ b/chrome/browser/extensions/script_badge_controller.cc @@ -17,13 +17,13 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/test_extension_service.cc b/chrome/browser/extensions/test_extension_service.cc index f506e96..d88db90 100644 --- a/chrome/browser/extensions/test_extension_service.cc +++ b/chrome/browser/extensions/test_extension_service.cc @@ -10,12 +10,13 @@ using extensions::Extension; TestExtensionService::~TestExtensionService() {} -const ExtensionSet* TestExtensionService::extensions() const { +const extensions::ExtensionSet* TestExtensionService::extensions() const { ADD_FAILURE(); return NULL; } -const ExtensionSet* TestExtensionService::disabled_extensions() const { +const extensions::ExtensionSet* TestExtensionService::disabled_extensions() + const { ADD_FAILURE(); return NULL; } diff --git a/chrome/browser/extensions/test_extension_service.h b/chrome/browser/extensions/test_extension_service.h index 7824b41..10f5413 100644 --- a/chrome/browser/extensions/test_extension_service.h +++ b/chrome/browser/extensions/test_extension_service.h @@ -23,8 +23,8 @@ class TestExtensionService : public ExtensionServiceInterface { virtual ~TestExtensionService(); // ExtensionServiceInterface implementation. - virtual const ExtensionSet* extensions() const OVERRIDE; - virtual const ExtensionSet* disabled_extensions() const OVERRIDE; + virtual const extensions::ExtensionSet* extensions() const OVERRIDE; + virtual const extensions::ExtensionSet* disabled_extensions() const OVERRIDE; virtual extensions::PendingExtensionManager* pending_extension_manager() OVERRIDE; diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc index 3cb4bc4ef..f629a85 100644 --- a/chrome/browser/extensions/updater/extension_updater.cc +++ b/chrome/browser/extensions/updater/extension_updater.cc @@ -22,7 +22,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/updater/extension_downloader.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" @@ -32,6 +31,7 @@ #include "extensions/browser/pending_extension_manager.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" using base::RandDouble; diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h index b178aec..48107a7 100644 --- a/chrome/browser/extensions/updater/extension_updater.h +++ b/chrome/browser/extensions/updater/extension_updater.h @@ -26,7 +26,6 @@ #include "url/gurl.h" class ExtensionServiceInterface; -class ExtensionSet; class PrefService; class Profile; @@ -34,6 +33,7 @@ namespace extensions { class ExtensionDownloader; class ExtensionPrefs; +class ExtensionSet; class ExtensionUpdaterTest; // A class for doing auto-updates of installed Extensions. Used like this: diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index 3f5692a..ebde012 100644 --- a/chrome/browser/extensions/user_script_master.cc +++ b/chrome/browser/extensions/user_script_master.cc @@ -24,13 +24,13 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/i18n/default_locale_handler.h" #include "chrome/common/extensions/extension_file_util.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" #include "chrome/common/extensions/message_bundle.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" +#include "extensions/common/extension_set.h" #include "ui/base/resource/resource_bundle.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h index 76f01fd..ddcc1f5b 100644 --- a/chrome/browser/extensions/user_script_master.h +++ b/chrome/browser/extensions/user_script_master.h @@ -15,10 +15,10 @@ #include "base/memory/shared_memory.h" #include "base/strings/string_piece.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/common/extension_set.h" #include "extensions/common/user_script.h" namespace content { @@ -27,11 +27,11 @@ class RenderProcessHost; class Profile; +namespace extensions { + typedef std::map<std::string, ExtensionSet::ExtensionPathAndDefaultLocale> ExtensionsInfo; -namespace extensions { - // Manages a segment of shared memory that contains the user scripts the user // has installed. Lives on the UI thread. class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>, diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc index 566e276..cf8979a 100644 --- a/chrome/browser/managed_mode/managed_user_service.cc +++ b/chrome/browser/managed_mode/managed_user_service.cc @@ -33,12 +33,12 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension_set.h" #include "google_apis/gaia/google_service_auth_error.h" #include "grit/generated_resources.h" #include "net/base/escape.h" @@ -398,8 +398,8 @@ ScopedVector<ManagedModeSiteList> ManagedUserService::GetActiveSiteLists() { if (!extension_service) return site_lists.Pass(); - const ExtensionSet* extensions = extension_service->extensions(); - for (ExtensionSet::const_iterator it = extensions->begin(); + const extensions::ExtensionSet* extensions = extension_service->extensions(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { const extensions::Extension* extension = it->get(); if (!extension_service->IsExtensionEnabled(extension->id())) diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc index af27d95..534a697 100644 --- a/chrome/browser/media_galleries/media_file_system_registry.cc +++ b/chrome/browser/media_galleries/media_file_system_registry.cc @@ -28,7 +28,6 @@ #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_details.h" @@ -41,6 +40,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "webkit/browser/fileapi/isolated_context.h" #include "webkit/common/fileapi/file_system_types.h" @@ -626,7 +626,8 @@ void MediaFileSystemRegistry::OnGalleryRemoved( // |profile|. const ExtensionService* extension_service = extensions::ExtensionSystem::Get(profile)->extension_service(); - const ExtensionSet* extensions_set = extension_service->extensions(); + const extensions::ExtensionSet* extensions_set = + extension_service->extensions(); ExtensionGalleriesHostMap::const_iterator host_map_it = extension_hosts_map_.find(profile); DCHECK(host_map_it != extension_hosts_map_.end()); diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index 45a7f3e..740216a 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc @@ -32,6 +32,7 @@ #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" @@ -80,8 +81,8 @@ int NumberExtensionsUsingMediaGalleries(Profile* profile) { if (!extension_service) return count; - const ExtensionSet* extensions = extension_service->extensions(); - for (ExtensionSet::const_iterator i = extensions->begin(); + const extensions::ExtensionSet* extensions = extension_service->extensions(); + for (extensions::ExtensionSet::const_iterator i = extensions->begin(); i != extensions->end(); ++i) { if (extensions::PermissionsData::HasAPIPermission( *i, extensions::APIPermission::kMediaGalleries) || diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index cc2a720..43ab144 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -40,6 +40,8 @@ #include "extensions/browser/event_router.h" #include "extensions/browser/info_map.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -514,11 +516,11 @@ base::string16 DesktopNotificationService::DisplayNameForOriginInProcessId( extensions::InfoMap* extension_info_map = extensions::ExtensionSystem::Get(profile_)->info_map(); if (extension_info_map) { - ExtensionSet extensions; + extensions::ExtensionSet extensions; extension_info_map->GetExtensionsWithAPIPermissionForSecurityOrigin( origin, process_id, extensions::APIPermission::kNotification, &extensions); - for (ExtensionSet::const_iterator iter = extensions.begin(); + for (extensions::ExtensionSet::const_iterator iter = extensions.begin(); iter != extensions.end(); ++iter) { NotifierId notifier_id(NotifierId::APPLICATION, (*iter)->id()); if (IsNotifierEnabled(notifier_id)) diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc index 2737964..e316ca0 100644 --- a/chrome/browser/notifications/message_center_notification_manager.cc +++ b/chrome/browser/notifications/message_center_notification_manager.cc @@ -19,12 +19,12 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/host_desktop.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "extensions/browser/info_map.h" +#include "extensions/common/extension_set.h" #include "ui/gfx/image/image_skia.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/message_center_tray.h" @@ -428,14 +428,14 @@ std::string MessageCenterNotificationManager::ProfileNotification::GetExtensionId() { extensions::InfoMap* extension_info_map = extensions::ExtensionSystem::Get(profile())->info_map(); - ExtensionSet extensions; + extensions::ExtensionSet extensions; extension_info_map->GetExtensionsWithAPIPermissionForSecurityOrigin( notification().origin_url(), notification().process_id(), extensions::APIPermission::kNotification, &extensions); DesktopNotificationService* desktop_service = DesktopNotificationServiceFactory::GetForProfile(profile()); - for (ExtensionSet::const_iterator iter = extensions.begin(); + for (extensions::ExtensionSet::const_iterator iter = extensions.begin(); iter != extensions.end(); ++iter) { if (desktop_service->IsNotifierEnabled(message_center::NotifierId( message_center::NotifierId::APPLICATION, (*iter)->id()))) { diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc index 4d35d2c..cc44460 100644 --- a/chrome/browser/notifications/message_center_settings_controller.cc +++ b/chrome/browser/notifications/message_center_settings_controller.cc @@ -192,7 +192,8 @@ void MessageCenterSettingsController::GetNotifierList( comparator.reset(new NotifierComparator(collator.get())); ExtensionService* extension_service = profile->GetExtensionService(); - const ExtensionSet* extension_set = extension_service->extensions(); + const extensions::ExtensionSet* extension_set = + extension_service->extensions(); // The extension icon size has to be 32x32 at least to load bigger icons if // the icon doesn't exist for the specified size, and in that case it falls // back to the default icon. The fetched icon will be resized in the settings @@ -200,7 +201,7 @@ void MessageCenterSettingsController::GetNotifierList( // crbug.com/222931 app_icon_loader_.reset(new extensions::AppIconLoaderImpl( profile, extension_misc::EXTENSION_ICON_SMALL, this)); - for (ExtensionSet::const_iterator iter = extension_set->begin(); + for (extensions::ExtensionSet::const_iterator iter = extension_set->begin(); iter != extension_set->end(); ++iter) { const extensions::Extension* extension = iter->get(); diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index fbc3f7c0..eddb97a 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -76,7 +76,6 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" @@ -121,6 +120,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" @@ -677,8 +677,9 @@ class PolicyTest : public InProcessBrowserTest { installer->Load(extension_path); observer.Wait(); - const ExtensionSet* extensions = extension_service()->extensions(); - for (ExtensionSet::const_iterator it = extensions->begin(); + const extensions::ExtensionSet* extensions = + extension_service()->extensions(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { if ((*it)->path() == extension_path) return it->get(); diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc index 2786b35..cd4eef2 100644 --- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc +++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc @@ -17,6 +17,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" +#include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "grit/google_chrome_strings.h" #include "ui/base/l10n/l10n_util.h" @@ -66,10 +67,10 @@ ResettableSettingsSnapshot::ResettableSettingsSnapshot(Profile* profile) ExtensionService* extension_service = profile->GetExtensionService(); DCHECK(extension_service); - const ExtensionSet* enabled_ext = extension_service->extensions(); + const extensions::ExtensionSet* enabled_ext = extension_service->extensions(); enabled_extensions_.reserve(enabled_ext->size()); - for (ExtensionSet::const_iterator it = enabled_ext->begin(); + for (extensions::ExtensionSet::const_iterator it = enabled_ext->begin(); it != enabled_ext->end(); ++it) enabled_extensions_.push_back(std::make_pair((*it)->id(), (*it)->name())); diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc index a9f8878..415ee0b 100644 --- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc +++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc @@ -17,6 +17,7 @@ #include "content/public/browser/render_view_host.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/dispatch_host_message.h" #include "ppapi/host/host_message_context.h" @@ -141,7 +142,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem( int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem( ppapi::host::HostMessageContext* context) { Profile* profile = GetProfile(); - const ExtensionSet* extension_set = NULL; + const extensions::ExtensionSet* extension_set = NULL; if (profile) { extension_set = extensions::ExtensionSystem::Get(profile)-> extension_service()->extensions(); diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc index 55bdffc..afa62a8 100644 --- a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc +++ b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc @@ -23,6 +23,7 @@ #include "extensions/browser/event_router.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "net/base/network_change_notifier.h" using extensions::EventRouter; @@ -69,8 +70,8 @@ void GetExtensionVoices(Profile* profile, std::vector<VoiceData>* out_voices) { bool is_offline = (net::NetworkChangeNotifier::GetConnectionType() == net::NetworkChangeNotifier::CONNECTION_NONE); - const ExtensionSet* extensions = service->extensions(); - ExtensionSet::const_iterator iter; + const extensions::ExtensionSet* extensions = service->extensions(); + extensions::ExtensionSet::const_iterator iter; for (iter = extensions->begin(); iter != extensions->end(); ++iter) { const Extension* extension = iter->get(); diff --git a/chrome/browser/sync/test/integration/extension_settings_helper.cc b/chrome/browser/sync/test/integration/extension_settings_helper.cc index acfb2fc..b51d590 100644 --- a/chrome/browser/sync/test/integration/extension_settings_helper.cc +++ b/chrome/browser/sync/test/integration/extension_settings_helper.cc @@ -17,9 +17,9 @@ #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_extension_helper.h" #include "chrome/browser/value_store/value_store.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" using content::BrowserThread; using sync_datatype_helper::test; @@ -57,7 +57,7 @@ scoped_ptr<DictionaryValue> GetAllSettings( } bool AreSettingsSame(Profile* expected_profile, Profile* actual_profile) { - const ExtensionSet* extensions = + const extensions::ExtensionSet* extensions = expected_profile->GetExtensionService()->extensions(); if (extensions->size() != actual_profile->GetExtensionService()->extensions()->size()) { @@ -66,7 +66,7 @@ bool AreSettingsSame(Profile* expected_profile, Profile* actual_profile) { } bool same = true; - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { const std::string& id = (*it)->id(); scoped_ptr<DictionaryValue> expected(GetAllSettings(expected_profile, id)); diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc index 1a0432d..5e1f845 100644 --- a/chrome/browser/sync/test/integration/sync_app_helper.cc +++ b/chrome/browser/sync/test/integration/sync_app_helper.cc @@ -12,6 +12,8 @@ #include "chrome/browser/sync/test/integration/sync_extension_helper.h" #include "chrome/common/extensions/sync_helper.h" #include "extensions/browser/app_sorting.h" +#include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/id_util.h" namespace { @@ -57,9 +59,9 @@ AppStateMap GetAppStates(Profile* profile) { ExtensionService* extension_service = profile->GetExtensionService(); - scoped_ptr<const ExtensionSet> extensions( + scoped_ptr<const extensions::ExtensionSet> extensions( extension_service->GenerateInstalledExtensionsSet()); - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { if (extensions::sync_helper::IsSyncableApp(it->get())) { const std::string& id = (*it)->id(); diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc index 912c969..c77d40a 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.cc +++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc @@ -17,6 +17,7 @@ #include "extensions/browser/pending_extension_info.h" #include "extensions/browser/pending_extension_manager.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest_constants.h" #include "sync/api/string_ordinal.h" @@ -87,9 +88,9 @@ std::vector<std::string> SyncExtensionHelper::GetInstalledExtensionNames( std::vector<std::string> names; ExtensionService* extension_service = profile->GetExtensionService(); - scoped_ptr<const ExtensionSet> extensions( + scoped_ptr<const extensions::ExtensionSet> extensions( extension_service->GenerateInstalledExtensionsSet()); - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { names.push_back((*it)->name()); } @@ -188,9 +189,9 @@ SyncExtensionHelper::ExtensionStateMap ExtensionService* extension_service = profile->GetExtensionService(); - scoped_ptr<const ExtensionSet> extensions( + scoped_ptr<const extensions::ExtensionSet> extensions( extension_service->GenerateInstalledExtensionsSet()); - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { const std::string& id = (*it)->id(); extension_state_map[id].enabled_state = diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc index f07033c..ff6d5df 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc @@ -16,6 +16,7 @@ #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" +#include "extensions/common/extension_set.h" #include "extensions/common/value_builder.h" #include "testing/gtest/include/gtest/gtest.h" @@ -53,11 +54,11 @@ class MockExtensionService : public TestExtensionService { MockExtensionService() {} virtual ~MockExtensionService() {} - virtual const ExtensionSet* extensions() const OVERRIDE { + virtual const extensions::ExtensionSet* extensions() const OVERRIDE { return &extensions_; } - virtual const ExtensionSet* disabled_extensions() const OVERRIDE { + virtual const extensions::ExtensionSet* disabled_extensions() const OVERRIDE { return &disabled_extensions_; } @@ -89,8 +90,8 @@ class MockExtensionService : public TestExtensionService { } private: - ExtensionSet extensions_; - ExtensionSet disabled_extensions_; + extensions::ExtensionSet extensions_; + extensions::ExtensionSet disabled_extensions_; DISALLOW_COPY_AND_ASSIGN(MockExtensionService); }; diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index 709bedf..24a40da 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -24,6 +24,8 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "ui/base/layout.h" @@ -334,10 +336,10 @@ void ThemeService::RemoveUnusedThemes(bool ignore_infobars) { return; std::string current_theme = GetThemeID(); std::vector<std::string> remove_list; - scoped_ptr<const ExtensionSet> extensions( + scoped_ptr<const extensions::ExtensionSet> extensions( service->GenerateInstalledExtensionsSet()); extensions::ExtensionPrefs* prefs = service->extension_prefs(); - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { const extensions::Extension* extension = *it; if (extension->is_theme() && diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate.cc b/chrome/browser/ui/app_list/app_list_controller_delegate.cc index dc2db5f..a0e6d3f 100644 --- a/chrome/browser/ui/app_list/app_list_controller_delegate.cc +++ b/chrome/browser/ui/app_list/app_list_controller_delegate.cc @@ -12,10 +12,10 @@ #include "chrome/browser/ui/app_list/extension_uninstaller.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "extensions/browser/management_policy.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "net/base/url_util.h" namespace { @@ -159,7 +159,7 @@ extensions::InstallTracker* AppListControllerDelegate::GetInstallTrackerFor( } void AppListControllerDelegate::GetApps(Profile* profile, - ExtensionSet* out_apps) { + extensions::ExtensionSet* out_apps) { ExtensionService* service = extensions::ExtensionSystem::Get(profile)->extension_service(); DCHECK(service); diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate.h b/chrome/browser/ui/app_list/app_list_controller_delegate.h index 9f2ad21..7ea9da9 100644 --- a/chrome/browser/ui/app_list/app_list_controller_delegate.h +++ b/chrome/browser/ui/app_list/app_list_controller_delegate.h @@ -10,7 +10,6 @@ #include "chrome/common/extensions/extension_constants.h" #include "ui/gfx/native_widget_types.h" -class ExtensionSet; class Profile; namespace base { @@ -19,6 +18,7 @@ class FilePath; namespace extensions { class Extension; +class ExtensionSet; class InstallTracker; } @@ -143,7 +143,7 @@ class AppListControllerDelegate { extensions::InstallTracker* GetInstallTrackerFor(Profile* profile); // Get the list of installed apps for the given profile. - void GetApps(Profile* profile, ExtensionSet* out_apps); + void GetApps(Profile* profile, extensions::ExtensionSet* out_apps); }; #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_CONTROLLER_DELEGATE_H_ diff --git a/chrome/browser/ui/app_list/extension_app_model_builder.cc b/chrome/browser/ui/app_list/extension_app_model_builder.cc index c026f74..16c2205 100644 --- a/chrome/browser/ui/app_list/extension_app_model_builder.cc +++ b/chrome/browser/ui/app_list/extension_app_model_builder.cc @@ -16,10 +16,10 @@ #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/ui/app_list/extension_app_item.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "ui/gfx/image/image_skia.h" using extensions::Extension; @@ -135,9 +135,10 @@ void ExtensionAppModelBuilder::OnShutdown() { } } -void ExtensionAppModelBuilder::AddApps(const ExtensionSet* extensions, - ExtensionAppList* apps) { - for (ExtensionSet::const_iterator app = extensions->begin(); +void ExtensionAppModelBuilder::AddApps( + const extensions::ExtensionSet* extensions, + ExtensionAppList* apps) { + for (extensions::ExtensionSet::const_iterator app = extensions->begin(); app != extensions->end(); ++app) { if (ShouldDisplayInAppLauncher(profile_, *app)) apps->push_back(new ExtensionAppItem(profile_, @@ -166,7 +167,7 @@ void ExtensionAppModelBuilder::BuildModel() { } void ExtensionAppModelBuilder::PopulateApps() { - ExtensionSet extensions; + extensions::ExtensionSet extensions; controller_->GetApps(profile_, &extensions); ExtensionAppList apps; AddApps(&extensions, &apps); diff --git a/chrome/browser/ui/app_list/extension_app_model_builder.h b/chrome/browser/ui/app_list/extension_app_model_builder.h index 43e3c73..95cc471 100644 --- a/chrome/browser/ui/app_list/extension_app_model_builder.h +++ b/chrome/browser/ui/app_list/extension_app_model_builder.h @@ -15,11 +15,11 @@ class AppListControllerDelegate; class ExtensionAppItem; -class ExtensionSet; class Profile; namespace extensions { class Extension; +class ExtensionSet; class InstallTracker; } @@ -68,7 +68,8 @@ class ExtensionAppModelBuilder : public extensions::InstallObserver, app_list::AppListItemModel* item) OVERRIDE; // Adds apps in |extensions| to |apps|. - void AddApps(const ExtensionSet* extensions, ExtensionAppList* apps); + void AddApps(const extensions::ExtensionSet* extensions, + ExtensionAppList* apps); // Populates the model with apps. void PopulateApps(); diff --git a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc index 92db9ba..632726b 100644 --- a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc +++ b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc @@ -20,6 +20,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "extensions/browser/app_sorting.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/app_list/app_list_item_model.h" @@ -118,7 +119,7 @@ class ExtensionAppModelBuilderTest : public ExtensionServiceTestBase { service_->Init(); // There should be 4 extensions in the test profile. - const ExtensionSet* extensions = service_->extensions(); + const extensions::ExtensionSet* extensions = service_->extensions(); ASSERT_EQ(static_cast<size_t>(4), extensions->size()); model_.reset(new app_list::AppListModel); diff --git a/chrome/browser/ui/app_list/recommended_apps.cc b/chrome/browser/ui/app_list/recommended_apps.cc index 5f95486..6e11212 100644 --- a/chrome/browser/ui/app_list/recommended_apps.cc +++ b/chrome/browser/ui/app_list/recommended_apps.cc @@ -16,6 +16,7 @@ #include "chrome/browser/ui/app_list/recommended_apps_observer.h" #include "chrome/common/pref_names.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" namespace app_list { @@ -70,8 +71,8 @@ void RecommendedApps::Update() { extensions::ExtensionPrefs* prefs = service->extension_prefs(); std::vector<AppSortInfo> sorted_apps; - const ExtensionSet* extensions = service->extensions(); - for (ExtensionSet::const_iterator app = extensions->begin(); + const extensions::ExtensionSet* extensions = service->extensions(); + for (extensions::ExtensionSet::const_iterator app = extensions->begin(); app != extensions->end(); ++app) { if (!(*app)->ShouldDisplayInAppLauncher()) continue; diff --git a/chrome/browser/ui/app_list/search/app_search_provider.cc b/chrome/browser/ui/app_list/search/app_search_provider.cc index 329455e..83e6257 100644 --- a/chrome/browser/ui/app_list/search/app_search_provider.cc +++ b/chrome/browser/ui/app_list/search/app_search_provider.cc @@ -17,6 +17,8 @@ #include "chrome/browser/ui/app_list/search/tokenized_string_match.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" namespace app_list { @@ -73,9 +75,9 @@ void AppSearchProvider::Start(const base::string16& query) { void AppSearchProvider::Stop() {} -void AppSearchProvider::AddApps(const ExtensionSet* extensions, +void AppSearchProvider::AddApps(const extensions::ExtensionSet* extensions, ExtensionService* service) { - for (ExtensionSet::const_iterator iter = extensions->begin(); + for (extensions::ExtensionSet::const_iterator iter = extensions->begin(); iter != extensions->end(); ++iter) { const extensions::Extension* app = iter->get(); diff --git a/chrome/browser/ui/app_list/search/app_search_provider.h b/chrome/browser/ui/app_list/search/app_search_provider.h index 530a782..5dfb5ff 100644 --- a/chrome/browser/ui/app_list/search/app_search_provider.h +++ b/chrome/browser/ui/app_list/search/app_search_provider.h @@ -13,9 +13,12 @@ class AppListControllerDelegate; class ExtensionService; -class ExtensionSet; class Profile; +namespace extensions { +class ExtensionSet; +} + namespace app_list { class AppSearchProvider : public SearchProvider, @@ -34,7 +37,8 @@ class AppSearchProvider : public SearchProvider, typedef ScopedVector<App> Apps; // Adds extensions to apps container if they should be displayed. - void AddApps(const ExtensionSet* extensions, ExtensionService* service); + void AddApps(const extensions::ExtensionSet* extensions, + ExtensionService* service); void RefreshApps(); // content::NotificationObserver overrides: diff --git a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc index ab44c2d..f25b09b 100644 --- a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc +++ b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/ui/app_list/search/app_search_provider.h" #include "chrome/browser/ui/app_list/search/chrome_search_result.h" #include "chrome/test/base/testing_profile.h" +#include "extensions/common/extension_set.h" #include "testing/gtest/include/gtest/gtest.h" namespace app_list { @@ -42,7 +43,7 @@ class AppSearchProviderTest : public ExtensionServiceTestBase { service_->Init(); // There should be 4 extensions in the test profile. - const ExtensionSet* extensions = service_->extensions(); + const extensions::ExtensionSet* extensions = service_->extensions(); ASSERT_EQ(static_cast<size_t>(4), extensions->size()); app_search_.reset(new AppSearchProvider(profile_.get(), NULL)); diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index acaa74b..d82fd40 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -75,6 +75,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/dns/mock_host_resolver.h" @@ -352,9 +353,10 @@ class BrowserTest : public ExtensionBrowserTest { // Returns the app extension aptly named "App Test". const Extension* GetExtension() { - const ExtensionSet* extensions = extensions::ExtensionSystem::Get( - browser()->profile())->extension_service()->extensions(); - for (ExtensionSet::const_iterator it = extensions->begin(); + const extensions::ExtensionSet* extensions = + extensions::ExtensionSystem::Get( + browser()->profile())->extension_service()->extensions(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { if ((*it)->name() == "App Test") return it->get(); diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 826279f..6f233f8 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -61,6 +61,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -730,10 +731,10 @@ bool LocationBarViewMac::IsBookmarkStarHiddenByExtension() { if (!extensions::FeatureSwitch::enable_override_bookmarks_ui()->IsEnabled()) return false; - const ExtensionSet* extension_set = + const extensions::ExtensionSet* extension_set = extensions::ExtensionSystem::GetForBrowserContext(profile_) ->extension_service()->extensions(); - for (ExtensionSet::const_iterator i = extension_set->begin(); + for (extensions::ExtensionSet::const_iterator i = extension_set->begin(); i != extension_set->end(); ++i) { const extensions::SettingsOverrides* settings_overrides = extensions::SettingsOverrides::Get(i->get()); diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc index e8d34d7..7cdfd61 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc @@ -6,10 +6,10 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/url_constants.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -20,7 +20,8 @@ base::string16 GetLabelTextForType(FullscreenExitBubbleType type, ExtensionService* extension_service) { base::string16 host(UTF8ToUTF16(url.host())); if (extension_service) { - const ExtensionSet* extensions = extension_service->extensions(); + const extensions::ExtensionSet* extensions = + extension_service->extensions(); DCHECK(extensions); const extensions::Extension* extension = extensions->GetExtensionOrAppByURL(url); diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index ddcd343..a45f2d8 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -78,6 +78,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -1943,8 +1944,8 @@ void LocationBarViewGtk::PageActionViewGtk::InspectPopup( } void LocationBarViewGtk::PageActionViewGtk::ConnectPageActionAccelerator() { - const ExtensionSet* extensions = owner_->browser()->profile()-> - GetExtensionService()->extensions(); + const extensions::ExtensionSet* extensions = + owner_->browser()->profile()->GetExtensionService()->extensions(); const Extension* extension = extensions->GetByID(page_action_->extension_id()); window_ = owner_->browser()->window()->GetNativeWindow(); diff --git a/chrome/browser/ui/gtk/script_bubble_gtk.cc b/chrome/browser/ui/gtk/script_bubble_gtk.cc index 600f07b..2774096 100644 --- a/chrome/browser/ui/gtk/script_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/script_bubble_gtk.cc @@ -16,11 +16,11 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" @@ -88,7 +88,7 @@ void ScriptBubbleGtk::BuildBubble() { extensions::TabHelper::FromWebContents(web_contents_); const std::set<std::string>& extensions_running_scripts = tab_helper->script_bubble_controller()->extensions_running_scripts(); - const ExtensionSet* loaded_extensions = + const extensions::ExtensionSet* loaded_extensions = ExtensionSystem::Get(profile_)->extension_service()->extensions(); std::string heading_string = diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc index 47ce5cf..7fc3688 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc @@ -19,9 +19,9 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/sync_helper.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "ui/gfx/color_utils.h" #include "ui/native_theme/native_theme.h" @@ -200,8 +200,9 @@ bool HasSyncedExtensions(Profile* profile) { extensions::ExtensionSystem* system = extensions::ExtensionSystem::Get(profile); if (system && system->extension_service()) { - const ExtensionSet* extensions = system->extension_service()->extensions(); - for (ExtensionSet::const_iterator iter = extensions->begin(); + const extensions::ExtensionSet* extensions = + system->extension_service()->extensions(); + for (extensions::ExtensionSet::const_iterator iter = extensions->begin(); iter != extensions->end(); ++iter) { // The webstore is synced so that it stays put on the new tab // page, but since it's installed by default we don't want to diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index da8c68b8..0d516dd 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -66,6 +66,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -1575,10 +1576,10 @@ bool LocationBarView::IsBookmarkStarHiddenByExtension() { if (!extensions::FeatureSwitch::enable_override_bookmarks_ui()->IsEnabled()) return false; - const ExtensionSet* extension_set = + const extensions::ExtensionSet* extension_set = extensions::ExtensionSystem::GetForBrowserContext(profile_) ->extension_service()->extensions(); - for (ExtensionSet::const_iterator i = extension_set->begin(); + for (extensions::ExtensionSet::const_iterator i = extension_set->begin(); i != extension_set->end(); ++i) { const extensions::SettingsOverrides* settings_overrides = extensions::SettingsOverrides::Get(i->get()); diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc index 520e799..212ae31 100644 --- a/chrome/browser/ui/webui/cookies_tree_model_util.cc +++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc @@ -15,6 +15,7 @@ #include "base/values.h" #include "chrome/browser/browsing_data/cookies_tree_model.h" #include "content/public/browser/indexed_db_context.h" +#include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "net/cookies/canonical_cookie.h" #include "net/ssl/ssl_client_cert_type.h" @@ -268,11 +269,11 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary( break; } - const ExtensionSet* protecting_apps = + const extensions::ExtensionSet* protecting_apps = node.GetModel()->ExtensionsProtectingNode(node); if (protecting_apps && !protecting_apps->is_empty()) { base::ListValue* app_infos = new base::ListValue; - for (ExtensionSet::const_iterator it = protecting_apps->begin(); + for (extensions::ExtensionSet::const_iterator it = protecting_apps->begin(); it != protecting_apps->end(); ++it) { base::DictionaryValue* app_info = new base::DictionaryValue(); app_info->SetString(kKeyId, (*it)->id()); diff --git a/chrome/browser/ui/webui/extensions/command_handler.cc b/chrome/browser/ui/webui/extensions/command_handler.cc index 5eddee2..69cf63b 100644 --- a/chrome/browser/ui/webui/extensions/command_handler.cc +++ b/chrome/browser/ui/webui/extensions/command_handler.cc @@ -12,9 +12,9 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc index 8910eca..adf9e1f 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc @@ -24,6 +24,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension_set.h" using extensions::Extension; @@ -110,7 +111,8 @@ const Extension* ExtensionSettingsUIBrowserTest::InstallExtension( << " num after: " << base::IntToString(num_after) << " Installed extensions follow:"; - for (ExtensionSet::const_iterator it = service->extensions()->begin(); + for (extensions::ExtensionSet::const_iterator it = + service->extensions()->begin(); it != service->extensions()->end(); ++it) VLOG(1) << " " << (*it)->id(); diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index 3ad44b4..1873e04 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -54,7 +54,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -76,6 +75,7 @@ #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/incognito_info.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index fdceb4e..e7895a5 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -46,7 +46,6 @@ #include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/pref_names.h" @@ -59,6 +58,7 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" +#include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "grit/net_internals_resources.h" #include "net/base/net_errors.h" @@ -853,9 +853,9 @@ void NetInternalsMessageHandler::OnGetExtensionInfo(const ListValue* list) { if (extension_system) { ExtensionService* extension_service = extension_system->extension_service(); if (extension_service) { - scoped_ptr<const ExtensionSet> extensions( + scoped_ptr<const extensions::ExtensionSet> extensions( extension_service->GenerateInstalledExtensionsSet()); - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { DictionaryValue* extension_info = new DictionaryValue(); bool enabled = extension_service->IsExtensionEnabled((*it)->id()); diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index e35efca..06599e8 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -51,6 +51,7 @@ #include "extensions/browser/management_policy.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -425,20 +426,21 @@ void AppLauncherHandler::HandleGetApps(const ListValue* args) { // The first time we load the apps we must add all current app to the list // of apps visible on the NTP. if (!has_loaded_apps_) { - const ExtensionSet* extensions = extension_service_->extensions(); - for (ExtensionSet::const_iterator it = extensions->begin(); + const extensions::ExtensionSet* extensions = + extension_service_->extensions(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { visible_apps_.insert((*it)->id()); } extensions = extension_service_->disabled_extensions(); - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { visible_apps_.insert((*it)->id()); } extensions = extension_service_->terminated_extensions(); - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { visible_apps_.insert((*it)->id()); } diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 140ce85..94687cc 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -30,7 +30,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -40,6 +39,7 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" #include "content/public/common/content_switches.h" +#include "extensions/common/extension_set.h" #include "extensions/common/permissions/api_permission.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -226,9 +226,9 @@ void AddExceptionsGrantedByHostedApps( const ExtensionService* extension_service = profile->GetExtensionService(); // After ExtensionSystem::Init has been called at the browser's start, // GetExtensionService() should not return NULL, so this is safe: - const ExtensionSet* extensions = extension_service->extensions(); + const extensions::ExtensionSet* extensions = extension_service->extensions(); - for (ExtensionSet::const_iterator extension = extensions->begin(); + for (extensions::ExtensionSet::const_iterator extension = extensions->begin(); extension != extensions->end(); ++extension) { if (!app_filter(*extension->get(), profile)) continue; diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc index 77c4c52..a28d2f5 100644 --- a/chrome/browser/ui/webui/policy_ui.cc +++ b/chrome/browser/ui/webui/policy_ui.cc @@ -69,8 +69,8 @@ #if !defined(OS_ANDROID) && !defined(OS_IOS) #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/common/extensions/extension_set.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #endif @@ -600,10 +600,10 @@ void PolicyUIHandler::SendPolicyNames() const { extensions::ExtensionSystem* extension_system = extensions::ExtensionSystem::Get(profile); - const ExtensionSet* extensions = + const extensions::ExtensionSet* extensions = extension_system->extension_service()->extensions(); - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { const extensions::Extension* extension = it->get(); // Skip this extension if it's not an enterprise extension. @@ -645,11 +645,11 @@ void PolicyUIHandler::SendPolicyValues() const { // Add extension policy values. extensions::ExtensionSystem* extension_system = extensions::ExtensionSystem::Get(Profile::FromWebUI(web_ui())); - const ExtensionSet* extensions = + const extensions::ExtensionSet* extensions = extension_system->extension_service()->extensions(); base::DictionaryValue* extension_values = new base::DictionaryValue; - for (ExtensionSet::const_iterator it = extensions->begin(); + for (extensions::ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { const extensions::Extension* extension = it->get(); // Skip this extension if it's not an enterprise extension. diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc index a55842d..da6daaa 100644 --- a/chrome/browser/ui/webui/uber/uber_ui.cc +++ b/chrome/browser/ui/webui/uber/uber_ui.cc @@ -12,7 +12,6 @@ #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/browser/ui/webui/extensions/extensions_ui.h" #include "chrome/browser/ui/webui/options/options_ui.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/url_constants.h" #include "content/public/browser/navigation_controller.h" @@ -21,6 +20,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "extensions/common/extension_set.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -68,10 +68,10 @@ content::WebUIDataSource* CreateUberHTMLSource() { // Determines whether the user has an active extension of the given type. bool HasExtensionType(Profile* profile, const char* extensionType) { - const ExtensionSet* extensionSet = + const extensions::ExtensionSet* extensionSet = profile->GetExtensionService()->extensions(); - for (ExtensionSet::const_iterator iter = extensionSet->begin(); + for (extensions::ExtensionSet::const_iterator iter = extensionSet->begin(); iter != extensionSet->end(); ++iter) { extensions::URLOverrides::URLOverrideMap map = extensions::URLOverrides::GetChromeURLOverrides(iter->get()); diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index a8ee329..c1bf6d4 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -179,8 +179,6 @@ 'common/extensions/extension_messages.h', 'common/extensions/extension_process_policy.cc', 'common/extensions/extension_process_policy.h', - 'common/extensions/extension_set.cc', - 'common/extensions/extension_set.h', 'common/extensions/features/api_feature.cc', 'common/extensions/features/api_feature.h', 'common/extensions/features/base_feature_provider.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index fdb0718..f6b274a 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -528,6 +528,7 @@ '../extensions/common/csp_validator_unittest.cc', '../extensions/common/event_filter_unittest.cc', '../extensions/common/extension_resource_unittest.cc', + '../extensions/common/extension_set_unittest.cc', '../extensions/common/file_util_unittest.cc', '../extensions/common/id_util_unittest.cc', '../extensions/common/manifest_handler_unittest.cc', @@ -1777,7 +1778,6 @@ 'common/extensions/extension_file_util_unittest.cc', 'common/extensions/extension_icon_set_unittest.cc', 'common/extensions/extension_l10n_util_unittest.cc', - 'common/extensions/extension_set_unittest.cc', 'common/extensions/extension_unittest.cc', 'common/extensions/feature_switch_unittest.cc', 'common/extensions/features/base_feature_provider_unittest.cc', diff --git a/chrome/common/extensions/extension_process_policy.cc b/chrome/common/extensions/extension_process_policy.cc index 962a4f5..add6a82 100644 --- a/chrome/common/extensions/extension_process_policy.cc +++ b/chrome/common/extensions/extension_process_policy.cc @@ -5,9 +5,9 @@ #include "chrome/common/extensions/extension_process_policy.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" namespace extensions { diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc index 4a90c89..86280a5 100644 --- a/chrome/common/localized_error.cc +++ b/chrome/common/localized_error.cc @@ -13,7 +13,6 @@ #include "base/values.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/net/net_error_info.h" #include "grit/chromium_strings.h" diff --git a/chrome/common/pepper_permission_util.cc b/chrome/common/pepper_permission_util.cc index 92cf4d4..a8e7675 100644 --- a/chrome/common/pepper_permission_util.cc +++ b/chrome/common/pepper_permission_util.cc @@ -10,9 +10,9 @@ #include "base/sha1.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" -#include "chrome/common/extensions/extension_set.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/shared_module_info.h" using extensions::Extension; @@ -36,7 +36,7 @@ bool HostIsInSet(const std::string& host, const std::set<std::string>& set) { bool IsExtensionOrSharedModuleWhitelisted( const GURL& url, - const ExtensionSet* extension_set, + const extensions::ExtensionSet* extension_set, const std::set<std::string>& whitelist) { if (!url.is_valid() || !url.SchemeIs(extensions::kExtensionScheme)) return false; @@ -70,7 +70,7 @@ bool IsExtensionOrSharedModuleWhitelisted( } bool IsHostAllowedByCommandLine(const GURL& url, - const ExtensionSet* extension_set, + const extensions::ExtensionSet* extension_set, const char* command_line_switch) { if (!url.is_valid()) return false; diff --git a/chrome/common/pepper_permission_util.h b/chrome/common/pepper_permission_util.h index 81e48ba..58a20e5 100644 --- a/chrome/common/pepper_permission_util.h +++ b/chrome/common/pepper_permission_util.h @@ -8,15 +8,18 @@ #include <set> #include <string> -class ExtensionSet; class GURL; +namespace extensions { +class ExtensionSet; +} + namespace chrome { // Returns true if the extension (or an imported module if any) is whitelisted. bool IsExtensionOrSharedModuleWhitelisted( const GURL& url, - const ExtensionSet* extension_set, + const extensions::ExtensionSet* extension_set, const std::set<std::string>& whitelist); // Checks whether the host of |url| is allowed by |command_line_switch|. @@ -26,7 +29,7 @@ bool IsExtensionOrSharedModuleWhitelisted( // (2) a list of host names separated by ',': returns true if |host| is in the // list. (NOTE: In this case, |url| doesn't have to belong to an extension.) bool IsHostAllowedByCommandLine(const GURL& url, - const ExtensionSet* extension_set, + const extensions::ExtensionSet* extension_set, const char* command_line_switch); } // namespace chrome diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 2fa016e..8a8d6e5 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -21,7 +21,6 @@ #include "chrome/common/extensions/chrome_extensions_client.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_process_policy.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/localized_error.h" #include "chrome/common/pepper_permission_util.h" #include "chrome/common/render_messages.h" @@ -77,6 +76,7 @@ #include "content/public/renderer/render_view_visitor.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/extension_urls.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -1045,7 +1045,8 @@ bool ChromeContentRendererClient::ShouldFork(WebFrame* frame, return true; } - const ExtensionSet* extensions = extension_dispatcher_->extensions(); + const extensions::ExtensionSet* extensions = + extension_dispatcher_->extensions(); // Determine if the new URL is an extension (excluding bookmark apps). const Extension* new_url_extension = extensions::GetNonBookmarkAppExtension( @@ -1176,7 +1177,7 @@ void ChromeContentRendererClient::SetExtensionDispatcher( bool ChromeContentRendererClient::CrossesExtensionExtents( WebFrame* frame, const GURL& new_url, - const ExtensionSet& extensions, + const extensions::ExtensionSet& extensions, bool is_extension_url, bool is_initial_navigation) { GURL old_url(frame->top()->document().url()); diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h index d768e3f..ac1c0d9 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -18,7 +18,6 @@ #include "content/public/renderer/content_renderer_client.h" class ChromeRenderProcessObserver; -class ExtensionSet; class PrescientNetworkingDispatcher; class RendererNetPredictor; class SearchBouncer; @@ -36,6 +35,7 @@ struct WebPluginInfo; namespace extensions { class Dispatcher; class Extension; +class ExtensionSet; class RendererPermissionsPolicyDelegate; } @@ -176,7 +176,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient { // extension app's extent. bool CrossesExtensionExtents(blink::WebFrame* frame, const GURL& new_url, - const ExtensionSet& extensions, + const extensions::ExtensionSet& extensions, bool is_extension_url, bool is_initial_navigation); diff --git a/chrome/renderer/extensions/app_bindings.cc b/chrome/renderer/extensions/app_bindings.cc index e587bd0..5f0ddb7 100644 --- a/chrome/renderer/extensions/app_bindings.cc +++ b/chrome/renderer/extensions/app_bindings.cc @@ -12,13 +12,13 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/console.h" #include "chrome/renderer/extensions/dispatcher.h" #include "chrome/renderer/extensions/extension_helper.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/public/web/WebDocument.h" diff --git a/chrome/renderer/extensions/chrome_v8_context.cc b/chrome/renderer/extensions/chrome_v8_context.cc index bdeebd1..aa7560a 100644 --- a/chrome/renderer/extensions/chrome_v8_context.cc +++ b/chrome/renderer/extensions/chrome_v8_context.cc @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_split.h" #include "base/values.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/features/base_feature_provider.h" #include "chrome/renderer/extensions/chrome_v8_extension.h" #include "chrome/renderer/extensions/module_system.h" diff --git a/chrome/renderer/extensions/chrome_v8_extension.cc b/chrome/renderer/extensions/chrome_v8_extension.cc index 02d287f..56fe379 100644 --- a/chrome/renderer/extensions/chrome_v8_extension.cc +++ b/chrome/renderer/extensions/chrome_v8_extension.cc @@ -4,24 +4,10 @@ #include "chrome/renderer/extensions/chrome_v8_extension.h" -#include "base/lazy_instance.h" #include "base/logging.h" -#include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/dispatcher.h" #include "content/public/renderer/render_view.h" -#include "extensions/common/extension.h" -#include "extensions/common/extension_api.h" -#include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebFrame.h" -#include "third_party/WebKit/public/web/WebView.h" -#include "ui/base/resource/resource_bundle.h" - -using blink::WebDocument; -using blink::WebFrame; -using blink::WebView; namespace extensions { diff --git a/chrome/renderer/extensions/dispatcher.h b/chrome/renderer/extensions/dispatcher.h index c0cf115..fea37df 100644 --- a/chrome/renderer/extensions/dispatcher.h +++ b/chrome/renderer/extensions/dispatcher.h @@ -12,13 +12,13 @@ #include "base/memory/shared_memory.h" #include "base/timer/timer.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/chrome_v8_context_set.h" #include "chrome/renderer/extensions/v8_schema_registry.h" #include "chrome/renderer/resource_bundle_source_map.h" #include "content/public/renderer/render_process_observer.h" #include "extensions/common/event_filter.h" +#include "extensions/common/extension_set.h" #include "extensions/common/extensions_client.h" #include "extensions/common/features/feature.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index 5c7349d..1f06a1e 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -15,7 +15,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/value_counter.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/extensions/chrome_v8_context.h" diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc index ad47414..21f53f5 100644 --- a/chrome/renderer/extensions/resource_request_policy.cc +++ b/chrome/renderer/extensions/resource_request_policy.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/extensions/web_accessible_resources_handler.h" @@ -16,6 +15,7 @@ #include "content/public/common/page_transition_types.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/web/WebConsoleMessage.h" #include "third_party/WebKit/public/web/WebDocument.h" diff --git a/chrome/renderer/extensions/resource_request_policy.h b/chrome/renderer/extensions/resource_request_policy.h index 183bcc46..d33fd53 100644 --- a/chrome/renderer/extensions/resource_request_policy.h +++ b/chrome/renderer/extensions/resource_request_policy.h @@ -7,7 +7,6 @@ #include "content/public/common/page_transition_types.h" -class ExtensionSet; class GURL; namespace blink { @@ -16,6 +15,8 @@ class WebFrame; namespace extensions { +class ExtensionSet; + // Encapsulates the policy for when chrome-extension:// and // chrome-extension-resource:// URLs can be requested. class ResourceRequestPolicy { diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index b3657a3..c922160 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -14,7 +14,6 @@ #include "base/strings/stringprintf.h" #include "base/timer/elapsed_timer.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/extension_set.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/chrome_render_process_observer.h" #include "chrome/renderer/extensions/dom_activity_logger.h" @@ -23,6 +22,7 @@ #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/csp_info.h" #include "extensions/common/permissions/permissions_data.h" #include "grit/renderer_resources.h" diff --git a/chrome/renderer/extensions/user_script_slave.h b/chrome/renderer/extensions/user_script_slave.h index 8b8e80a..42acf43 100644 --- a/chrome/renderer/extensions/user_script_slave.h +++ b/chrome/renderer/extensions/user_script_slave.h @@ -17,7 +17,6 @@ #include "extensions/common/user_script.h" #include "third_party/WebKit/public/web/WebScriptSource.h" -class ExtensionSet; class GURL; namespace blink { @@ -28,6 +27,7 @@ using blink::WebScriptSource; namespace extensions { class Extension; +class ExtensionSet; // Manages installed UserScripts for a render process. class UserScriptSlave { diff --git a/chrome/test/remoting/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc index 2a03c2d..58d6593 100644 --- a/chrome/test/remoting/remote_desktop_browsertest.cc +++ b/chrome/test/remoting/remote_desktop_browsertest.cc @@ -18,6 +18,7 @@ #include "content/public/test/test_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "ui/base/window_open_disposition.h" namespace remoting { @@ -116,12 +117,13 @@ void RemoteDesktopBrowserTest::UninstallChromotingApp() { } void RemoteDesktopBrowserTest::VerifyChromotingLoaded(bool expected) { - const ExtensionSet* extensions = extension_service()->extensions(); + const extensions::ExtensionSet* extensions = + extension_service()->extensions(); scoped_refptr<const extensions::Extension> extension; - ExtensionSet::const_iterator iter; bool installed = false; - for (iter = extensions->begin(); iter != extensions->end(); ++iter) { + for (extensions::ExtensionSet::const_iterator iter = extensions->begin(); + iter != extensions->end(); ++iter) { extension = *iter; // Is there a better way to recognize the chromoting extension // than name comparison? diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS index 35e3158..8bd19ef 100644 --- a/extensions/browser/DEPS +++ b/extensions/browser/DEPS @@ -19,7 +19,6 @@ include_rules = [ "+chrome/browser/extensions/extension_util.h", "+chrome/browser/renderer_host/chrome_render_message_filter.h", "+chrome/common/extensions/extension_messages.h", - "+chrome/common/extensions/extension_set.h", "+grit/generated_resources.h", ] diff --git a/extensions/browser/info_map.cc b/extensions/browser/info_map.cc index 2bff206..3f55ceb 100644 --- a/extensions/browser/info_map.cc +++ b/extensions/browser/info_map.cc @@ -4,10 +4,10 @@ #include "extensions/browser/info_map.h" -#include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/incognito_info.h" using content::BrowserThread; diff --git a/extensions/browser/info_map.h b/extensions/browser/info_map.h index 8d5cf6d..34e1a9a 100644 --- a/extensions/browser/info_map.h +++ b/extensions/browser/info_map.h @@ -11,9 +11,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" -#include "chrome/common/extensions/extension_set.h" #include "extensions/browser/process_map.h" #include "extensions/browser/quota_service.h" +#include "extensions/common/extension_set.h" namespace extensions { class Extension; diff --git a/chrome/common/extensions/extension_set.cc b/extensions/common/extension_set.cc index 181bcd5..d68903b 100644 --- a/chrome/common/extensions/extension_set.cc +++ b/extensions/common/extension_set.cc @@ -1,18 +1,17 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/extensions/extension_set.h" +#include "extensions/common/extension_set.h" #include "base/callback.h" #include "base/logging.h" #include "base/stl_util.h" -#include "chrome/common/url_constants.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/sandboxed_page_info.h" -using extensions::Extension; +namespace extensions { ExtensionSet::const_iterator::const_iterator() {} @@ -73,7 +72,7 @@ void ExtensionSet::Clear() { } std::string ExtensionSet::GetExtensionOrAppIDByURL(const GURL& url) const { - if (url.SchemeIs(extensions::kExtensionScheme)) + if (url.SchemeIs(kExtensionScheme)) return url.host(); const Extension* extension = GetExtensionOrAppByURL(url); @@ -84,7 +83,7 @@ std::string ExtensionSet::GetExtensionOrAppIDByURL(const GURL& url) const { } const Extension* ExtensionSet::GetExtensionOrAppByURL(const GURL& url) const { - if (url.SchemeIs(extensions::kExtensionScheme)) + if (url.SchemeIs(kExtensionScheme)) return GetByID(url.host()); return GetHostedAppByURL(url); @@ -101,7 +100,7 @@ const Extension* ExtensionSet::GetHostedAppByURL(const GURL& url) const { } const Extension* ExtensionSet::GetHostedAppByOverlappingWebExtent( - const extensions::URLPatternSet& extent) const { + const URLPatternSet& extent) const { for (ExtensionMap::const_iterator iter = extensions_.begin(); iter != extensions_.end(); ++iter) { if (iter->second->web_extent().OverlapsWith(extent)) @@ -125,8 +124,8 @@ const Extension* ExtensionSet::GetByID(const std::string& id) const { return NULL; } -extensions::ExtensionIdSet ExtensionSet::GetIDs() const { - extensions::ExtensionIdSet ids; +ExtensionIdSet ExtensionSet::GetIDs() const { + ExtensionIdSet ids; for (ExtensionMap::const_iterator it = extensions_.begin(); it != extensions_.end(); ++it) { ids.insert(it->first); @@ -135,15 +134,17 @@ extensions::ExtensionIdSet ExtensionSet::GetIDs() const { } bool ExtensionSet::ExtensionBindingsAllowed(const GURL& url) const { - if (url.SchemeIs(extensions::kExtensionScheme)) + if (url.SchemeIs(kExtensionScheme)) return true; - ExtensionMap::const_iterator i = extensions_.begin(); - for (; i != extensions_.end(); ++i) { - if (i->second->location() == extensions::Manifest::COMPONENT && - i->second->web_extent().MatchesURL(url)) + for (ExtensionMap::const_iterator it = extensions_.begin(); + it != extensions_.end(); ++it) { + if (it->second->location() == Manifest::COMPONENT && + it->second->web_extent().MatchesURL(url)) return true; } return false; } + +} // namespace extensions diff --git a/chrome/common/extensions/extension_set.h b/extensions/common/extension_set.h index b6251d6..4ba6530 100644 --- a/chrome/common/extensions/extension_set.h +++ b/extensions/common/extension_set.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_SET_H_ -#define CHROME_COMMON_EXTENSIONS_EXTENSION_SET_H_ +#ifndef EXTENSIONS_COMMON_EXTENSION_SET_H_ +#define EXTENSIONS_COMMON_EXTENSION_SET_H_ #include <iterator> #include <map> @@ -15,21 +15,21 @@ #include "extensions/common/extension.h" #include "url/gurl.h" +namespace extensions { + // The one true extension container. Extensions are identified by their id. // Only one extension can be in the set with a given ID. class ExtensionSet { public: typedef std::pair<base::FilePath, std::string> ExtensionPathAndDefaultLocale; - typedef std::map<std::string, scoped_refptr<const extensions::Extension> > - ExtensionMap; - typedef base::Callback<void(const extensions::ExtensionIdSet&)> + typedef std::map<std::string, scoped_refptr<const Extension> > ExtensionMap; + typedef base::Callback<void(const ExtensionIdSet&)> ModificationCallback; // Iteration over the values of the map (given that it's an ExtensionSet, // it should iterate like a set iterator). - class const_iterator : - public std::iterator<std::input_iterator_tag, - scoped_refptr<const extensions::Extension> > { + class const_iterator : public std::iterator<std::input_iterator_tag, + scoped_refptr<const Extension> > { public: const_iterator(); const_iterator(const const_iterator& other); @@ -44,10 +44,10 @@ class ExtensionSet { ++it_; return old; } - const scoped_refptr<const extensions::Extension>& operator*() const { + const scoped_refptr<const Extension>& operator*() const { return it_->second; } - const scoped_refptr<const extensions::Extension>* operator->() const { + const scoped_refptr<const Extension>* operator->() const { return &it_->second; } bool operator!=(const const_iterator& other) const { @@ -77,7 +77,7 @@ class ExtensionSet { // Adds the specified extension to the set. The set becomes an owner. Any // previous extension with the same ID is removed. // Returns true if there is no previous extension. - bool Insert(const scoped_refptr<const extensions::Extension>& extension); + bool Insert(const scoped_refptr<const Extension>& extension); // Copies different items from |extensions| to the current set and returns // whether anything changed. @@ -99,25 +99,25 @@ class ExtensionSet { // NOTE: This can return NULL if called before UpdateExtensions receives // bulk extension data (e.g. if called from // EventBindings::HandleContextCreated) - const extensions::Extension* GetExtensionOrAppByURL(const GURL& url) const; + const Extension* GetExtensionOrAppByURL(const GURL& url) const; // Returns the hosted app whose web extent contains the URL. - const extensions::Extension* GetHostedAppByURL(const GURL& url) const; + const Extension* GetHostedAppByURL(const GURL& url) const; // Returns a hosted app that contains any URL that overlaps with the given // extent, if one exists. - const extensions::Extension* GetHostedAppByOverlappingWebExtent( - const extensions::URLPatternSet& extent) const; + const Extension* GetHostedAppByOverlappingWebExtent( + const URLPatternSet& extent) const; // Returns true if |new_url| is in the extent of the same extension as // |old_url|. Also returns true if neither URL is in an app. bool InSameExtent(const GURL& old_url, const GURL& new_url) const; // Look up an Extension object by id. - const extensions::Extension* GetByID(const std::string& id) const; + const Extension* GetByID(const std::string& id) const; // Gets the IDs of all extensions in the set. - extensions::ExtensionIdSet GetIDs() const; + ExtensionIdSet GetIDs() const; // Returns true if |info| should get extension api bindings and be permitted // to make api calls. Note that this is independent of what extension @@ -143,4 +143,6 @@ class ExtensionSet { DISALLOW_COPY_AND_ASSIGN(ExtensionSet); }; -#endif // CHROME_COMMON_EXTENSIONS_EXTENSION_SET_H_ +} // namespace extensions + +#endif // EXTENSIONS_COMMON_EXTENSION_SET_H_ diff --git a/chrome/common/extensions/extension_set_unittest.cc b/extensions/common/extension_set_unittest.cc index 2be19ca..75a69de 100644 --- a/chrome/common/extensions/extension_set_unittest.cc +++ b/extensions/common/extension_set_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,11 +7,11 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/common/extensions/extension_set.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #include "testing/gtest/include/gtest/gtest.h" -using extensions::Extension; +namespace extensions { namespace { @@ -40,7 +40,7 @@ scoped_refptr<Extension> CreateTestExtension(const std::string& name, std::string error; scoped_refptr<Extension> extension( - Extension::Create(path, extensions::Manifest::INTERNAL, manifest, + Extension::Create(path, Manifest::INTERNAL, manifest, Extension::NO_FLAGS, &error)); EXPECT_TRUE(extension.get()) << error; return extension; @@ -138,3 +138,5 @@ TEST(ExtensionSetTest, ExtensionSet) { ASSERT_FALSE(extensions.InsertAll(*to_add)); // Re-adding same set no-ops. EXPECT_EQ(4u, extensions.size()); } + +} // namespace extensions diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index ce04afa..4609d46 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -48,6 +48,8 @@ 'common/extension_paths.h', 'common/extension_resource.cc', 'common/extension_resource.h', + 'common/extension_set.cc', + 'common/extension_set.h', 'common/extension_urls.cc', 'common/extension_urls.h', 'common/extensions_client.cc', |