diff options
18 files changed, 68 insertions, 51 deletions
diff --git a/chrome/browser/extensions/api/tabs/tabs.cc b/chrome/browser/extensions/api/tabs/tabs.cc index aeb682b..99d8749 100644 --- a/chrome/browser/extensions/api/tabs/tabs.cc +++ b/chrome/browser/extensions/api/tabs/tabs.cc @@ -10,6 +10,7 @@ #include "base/base64.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" @@ -76,7 +77,6 @@ #if defined(USE_ASH) #include "ash/ash_switches.h" -#include "base/command_line.h" #include "chrome/browser/ui/views/ash/panel_view_aura.h" #endif diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 3d2f2dc..6db83af 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h" +#include "base/command_line.h" #include "base/lazy_instance.h" #include "base/memory/scoped_vector.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc index 858c69e..23efe82 100644 --- a/chrome/browser/extensions/convert_web_app_browsertest.cc +++ b/chrome/browser/extensions/convert_web_app_browsertest.cc @@ -4,6 +4,7 @@ #include <string> +#include "base/command_line.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 485eb6b..51ec084 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -106,7 +106,6 @@ #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "sync/api/sync_change.h" #include "sync/api/sync_error_factory.h" -#include "ui/base/l10n/l10n_util.h" #include "webkit/database/database_tracker.h" #include "webkit/database/database_util.h" @@ -122,7 +121,6 @@ #include "webkit/fileapi/file_system_mount_point_provider.h" #endif -using base::Time; using content::BrowserContext; using content::BrowserThread; using content::DevToolsAgentHost; @@ -261,16 +259,13 @@ bool ExtensionService::OnExternalExtensionUpdateUrlFound( return true; } -const Extension* ExtensionService::GetInstalledApp(const GURL& url) { +const Extension* ExtensionService::GetInstalledApp(const GURL& url) const { const Extension* extension = extensions_.GetExtensionOrAppByURL( ExtensionURLInfo(url)); - if (extension && extension->is_app()) - return extension; - - return NULL; + return (extension && extension->is_app()) ? extension : NULL; } -bool ExtensionService::IsInstalledApp(const GURL& url) { +bool ExtensionService::IsInstalledApp(const GURL& url) const { return !!GetInstalledApp(url); } @@ -280,11 +275,10 @@ void ExtensionService::SetInstalledAppForRenderer(int renderer_child_id, } const Extension* ExtensionService::GetInstalledAppForRenderer( - int renderer_child_id) { - InstalledAppMap::iterator i = installed_app_hosts_.find(renderer_child_id); - if (i == installed_app_hosts_.end()) - return NULL; - return i->second; + int renderer_child_id) const { + InstalledAppMap::const_iterator i = + installed_app_hosts_.find(renderer_child_id); + return i == installed_app_hosts_.end() ? NULL : i->second; } // static @@ -809,8 +803,9 @@ bool ExtensionService::UninstallExtension( bool ExtensionService::IsExtensionEnabled( const std::string& extension_id) const { if (extensions_.Contains(extension_id) || - terminated_extensions_.Contains(extension_id)) + terminated_extensions_.Contains(extension_id)) { return true; + } if (disabled_extensions_.Contains(extension_id)) return false; @@ -1584,7 +1579,7 @@ void ExtensionService::SetAppNotificationDisabled( SyncExtensionChangeIfNeeded(*extension); } -bool ExtensionService::CanCrossIncognito(const Extension* extension) { +bool ExtensionService::CanCrossIncognito(const Extension* extension) const { // We allow the extension to see events and data from another profile iff it // uses "spanning" behavior and it has incognito access. "split" mode // extensions only see events for a matching profile. @@ -1616,7 +1611,7 @@ void ExtensionService::OnExtensionMoved( SyncExtensionChangeIfNeeded(*extension); } -bool ExtensionService::AllowFileAccess(const Extension* extension) { +bool ExtensionService::AllowFileAccess(const Extension* extension) const { return (CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableExtensionsFileAccessCheck) || extension_prefs_->AllowFileAccess(extension->id())); @@ -2465,9 +2460,13 @@ ExtensionIdSet ExtensionService::GetAppIds() const { return result; } -bool ExtensionService::IsBackgroundPageReady(const Extension* extension) { - return (!extension->has_persistent_background_page() || - extension_runtime_data_[extension->id()].background_page_ready); +bool ExtensionService::IsBackgroundPageReady(const Extension* extension) const { + if (!extension->has_persistent_background_page()) + return true; + ExtensionRuntimeDataMap::const_iterator it = + extension_runtime_data_.find(extension->id()); + return it == extension_runtime_data_.end() ? false : + it->second.background_page_ready; } void ExtensionService::SetBackgroundPageReady(const Extension* extension) { @@ -2479,8 +2478,11 @@ void ExtensionService::SetBackgroundPageReady(const Extension* extension) { content::NotificationService::NoDetails()); } -bool ExtensionService::IsBeingUpgraded(const Extension* extension) { - return extension_runtime_data_[extension->id()].being_upgraded; +bool ExtensionService::IsBeingUpgraded(const Extension* extension) const { + ExtensionRuntimeDataMap::const_iterator it = + extension_runtime_data_.find(extension->id()); + return it == extension_runtime_data_.end() ? false : + it->second.being_upgraded; } void ExtensionService::SetBeingUpgraded(const Extension* extension, @@ -2488,8 +2490,11 @@ void ExtensionService::SetBeingUpgraded(const Extension* extension, extension_runtime_data_[extension->id()].being_upgraded = value; } -bool ExtensionService::HasUsedWebRequest(const Extension* extension) { - return extension_runtime_data_[extension->id()].has_used_webrequest; +bool ExtensionService::HasUsedWebRequest(const Extension* extension) const { + ExtensionRuntimeDataMap::const_iterator it = + extension_runtime_data_.find(extension->id()); + return it == extension_runtime_data_.end() ? false : + it->second.has_used_webrequest; } void ExtensionService::SetHasUsedWebRequest(const Extension* extension, diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 448b62f..7e53bb1 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -7,11 +7,9 @@ #include <list> #include <map> -#include <set> #include <string> #include <vector> -#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/gtest_prod_util.h" @@ -46,6 +44,7 @@ #include "sync/api/syncable_service.h" class BookmarkExtensionEventRouter; +class CommandLine; class ExtensionErrorUI; class ExtensionFontSettingsEventRouter; class ExtensionManagementEventRouter; @@ -85,7 +84,6 @@ class WindowEventRouter; } namespace syncer { -class SyncData; class SyncErrorFactory; } @@ -175,10 +173,10 @@ class ExtensionService static const char* kStateStoreName; // Returns the Extension of hosted or packaged apps, NULL otherwise. - const extensions::Extension* GetInstalledApp(const GURL& url); + const extensions::Extension* GetInstalledApp(const GURL& url) const; // Returns whether the URL is from either a hosted or packaged app. - bool IsInstalledApp(const GURL& url); + bool IsInstalledApp(const GURL& url) const; // Associates a renderer process with the given installed app. void SetInstalledAppForRenderer(int renderer_child_id, @@ -187,7 +185,7 @@ class ExtensionService // If the renderer is hosting an installed app, returns it, otherwise returns // NULL. const extensions::Extension* GetInstalledAppForRenderer( - int renderer_child_id); + int renderer_child_id) const; // Attempts to uninstall an extension from a given ExtensionService. Returns // true iff the target extension exists. @@ -246,13 +244,13 @@ class ExtensionService // Returns true if the given extension can see events and data from another // sub-profile (incognito to original profile, or vice versa). - bool CanCrossIncognito(const extensions::Extension* extension); + bool CanCrossIncognito(const extensions::Extension* extension) const; // Returns true if the given extension can be loaded in incognito. bool CanLoadInIncognito(const extensions::Extension* extension) const; // Whether this extension can inject scripts into pages with file URLs. - bool AllowFileAccess(const extensions::Extension* extension); + bool AllowFileAccess(const extensions::Extension* extension) const; // Will reload the extension since this permission is applied at loading time // only. void SetAllowFileAccess(const extensions::Extension* extension, bool allow); @@ -260,18 +258,18 @@ class ExtensionService // Whether the persistent background page, if any, is ready. We don't load // other components until then. If there is no background page, or if it is // non-persistent (lazy), we consider it to be ready. - bool IsBackgroundPageReady(const extensions::Extension* extension); + bool IsBackgroundPageReady(const extensions::Extension* extension) const; void SetBackgroundPageReady(const extensions::Extension* extension); // Getter and setter for the flag that specifies whether the extension is // being upgraded. - bool IsBeingUpgraded(const extensions::Extension* extension); + bool IsBeingUpgraded(const extensions::Extension* extension) const; void SetBeingUpgraded(const extensions::Extension* extension, bool value); // Getter and setter for the flag that specifies if the extension has used // the webrequest API. // TODO(mpcomplete): remove. http://crbug.com/100411 - bool HasUsedWebRequest(const extensions::Extension* extension); + bool HasUsedWebRequest(const extensions::Extension* extension) const; void SetHasUsedWebRequest(const extensions::Extension* extension, bool value); // Getter for the extension's runtime data PropertyBag. diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index 25ffde9..71f8d41 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -7,6 +7,7 @@ #include <set> #include <vector> +#include "base/command_line.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_manager_extension_api.h" diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc index ffdba4e..9a11ef4 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_unpacker.cc @@ -8,6 +8,7 @@ #include "base/base64.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/file_util.h" #include "base/file_util_proxy.h" #include "base/json/json_string_value_serializer.h" diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc index 0778ad8..b0c90bc 100644 --- a/chrome/browser/extensions/startup_helper.cc +++ b/chrome/browser/extensions/startup_helper.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/startup_helper.h" +#include "base/command_line.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index acc4a82..29af84b 100644 --- a/chrome/browser/extensions/test_extension_system.cc +++ b/chrome/browser/extensions/test_extension_system.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/test_extension_system.h" +#include "base/command_line.h" #include "chrome/browser/extensions/api/alarms/alarm_manager.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_devtools_manager.h" diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index f087cd2..5bf0548 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -7,6 +7,7 @@ #include <set> #include <vector> +#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" @@ -310,8 +311,7 @@ class ServiceForDownloadTests : public MockService { // Add a fake crx installer to be returned by a call to UpdateExtension() // with a specific ID. Caller keeps ownership of |crx_installer|. - void AddFakeCrxInstaller(std::string& id, - CrxInstaller* crx_installer) { + void AddFakeCrxInstaller(const std::string& id, CrxInstaller* crx_installer) { fake_crx_installers_[id] = crx_installer; } diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index d504b63..00346a6 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -8,6 +8,7 @@ #include "base/basictypes.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/file_version_info.h" #include "base/i18n/rtl.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc index c137fea..784eda0 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc @@ -9,6 +9,7 @@ #include <vector> #include "ash/launcher/launcher_model.h" +#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm index 22e6fde..f2b1597 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/command_line.h" #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" 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 117dfc5..c6fdc9a 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 @@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/message_loop.h" #include "base/stl_util.h" #include "base/string_util.h" diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index 4833709..554d6ff 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -10,6 +10,7 @@ #include "base/basictypes.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/debug/trace_event.h" #include "base/i18n/rtl.h" #include "base/logging.h" @@ -702,7 +703,7 @@ WebContents* LocationBarViewGtk::GetWebContents() const { } void LocationBarViewGtk::SetPreviewEnabledPageAction( - ExtensionAction *page_action, + ExtensionAction* page_action, bool preview_enabled) { DCHECK(page_action); for (ScopedVector<PageActionViewGtk>::iterator iter = @@ -717,7 +718,7 @@ void LocationBarViewGtk::SetPreviewEnabledPageAction( } GtkWidget* LocationBarViewGtk::GetPageActionWidget( - ExtensionAction *page_action) { + ExtensionAction* page_action) { DCHECK(page_action); for (ScopedVector<PageActionViewGtk>::iterator iter = page_action_views_.begin(); diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc index 65cf5383..0815cc1 100644 --- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc +++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback.h" +#include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -79,16 +80,16 @@ const char kCWSFakeIconURLFormat[] = "http://example.com/%s/icon.png"; class DummyURLFetcherFactory : public net::URLFetcherFactory { public: - DummyURLFetcherFactory() {} - virtual ~DummyURLFetcherFactory() {} - - virtual net::URLFetcher* CreateURLFetcher( - int id, - const GURL& url, - net::URLFetcher::RequestType request_type, - net::URLFetcherDelegate* d) OVERRIDE { - return new net::TestURLFetcher(id, url, d); - } + DummyURLFetcherFactory() {} + virtual ~DummyURLFetcherFactory() {} + + virtual net::URLFetcher* CreateURLFetcher( + int id, + const GURL& url, + net::URLFetcher::RequestType request_type, + net::URLFetcherDelegate* d) OVERRIDE { + return new net::TestURLFetcher(id, url, d); + } }; } // namespace @@ -431,8 +432,8 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, EXPECT_EQ(original, chrome::GetActiveWebContents(browser())->GetURL()); } -class WebIntentPickerControllerIncognitoBrowserTest : - public WebIntentPickerControllerBrowserTest { +class WebIntentPickerControllerIncognitoBrowserTest + : public WebIntentPickerControllerBrowserTest { public: WebIntentPickerControllerIncognitoBrowserTest() {} diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index d6f193a..0744280 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/environment.h" #include "base/event_recorder.h" 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 d2fb4d0..8e9f3b3 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -7,6 +7,7 @@ #include <algorithm> #include <map> +#include "base/command_line.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" |