Rename ExtensionWarningBadgeService to WarningBadgeService
As the comment in extension_warning_badge_service.h by battre@,
rename ExtensionWarningBadgeService to WarningBadgeService and related class.
And rename the files too.
BUG=458829
[email protected]
Review URL: https://codereview.chromium.org/921423003
Cr-Commit-Position: refs/heads/master@{#317992}
diff --git a/chrome/browser/extensions/browser_context_keyed_service_factories.cc b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
index 43632b2..86d48df 100644
--- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -43,12 +43,12 @@
#include "chrome/browser/extensions/extension_storage_monitor_factory.h"
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/extensions/extension_toolbar_model_factory.h"
-#include "chrome/browser/extensions/extension_warning_badge_service_factory.h"
#include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
#include "chrome/browser/extensions/install_tracker_factory.h"
#include "chrome/browser/extensions/menu_manager_factory.h"
#include "chrome/browser/extensions/plugin_manager.h"
#include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"
+#include "chrome/browser/extensions/warning_badge_service_factory.h"
#include "chrome/browser/speech/extension_api/tts_extension_api.h"
#include "extensions/browser/api/api_resource_manager.h"
#include "extensions/browser/api/bluetooth/bluetooth_api.h"
@@ -96,7 +96,6 @@
extensions::ExtensionStorageMonitorFactory::GetInstance();
extensions::ExtensionSystemFactory::GetInstance();
extensions::ExtensionToolbarModelFactory::GetInstance();
- extensions::ExtensionWarningBadgeServiceFactory::GetInstance();
extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance();
extensions::FeedbackPrivateAPI::GetFactoryInstance();
extensions::FontSettingsAPI::GetFactoryInstance();
@@ -140,6 +139,7 @@
#if defined(OS_CHROMEOS)
extensions::VirtualKeyboardAPI::GetFactoryInstance();
#endif
+ extensions::WarningBadgeServiceFactory::GetInstance();
extensions::WebNavigationAPI::GetFactoryInstance();
extensions::WebRequestAPI::GetFactoryInstance();
extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();
diff --git a/chrome/browser/extensions/extension_warning_badge_service_factory.cc b/chrome/browser/extensions/extension_warning_badge_service_factory.cc
deleted file mode 100644
index 09b85f3..0000000
--- a/chrome/browser/extensions/extension_warning_badge_service_factory.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2014 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/browser/extensions/extension_warning_badge_service_factory.h"
-
-#include "chrome/browser/extensions/extension_warning_badge_service.h"
-#include "chrome/browser/profiles/profile.h"
-#include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "extensions/browser/extensions_browser_client.h"
-#include "extensions/browser/warning_service_factory.h"
-
-using content::BrowserContext;
-
-namespace extensions {
-
-// static
-ExtensionWarningBadgeService*
-ExtensionWarningBadgeServiceFactory::GetForBrowserContext(
- BrowserContext* context) {
- return static_cast<ExtensionWarningBadgeService*>(
- GetInstance()->GetServiceForBrowserContext(context, true));
-}
-
-// static
-ExtensionWarningBadgeServiceFactory*
-ExtensionWarningBadgeServiceFactory::GetInstance() {
- return Singleton<ExtensionWarningBadgeServiceFactory>::get();
-}
-
-ExtensionWarningBadgeServiceFactory::ExtensionWarningBadgeServiceFactory()
- : BrowserContextKeyedServiceFactory(
- "ExtensionWarningBadgeService",
- BrowserContextDependencyManager::GetInstance()) {
- DependsOn(WarningServiceFactory::GetInstance());
-}
-
-ExtensionWarningBadgeServiceFactory::~ExtensionWarningBadgeServiceFactory() {
-}
-
-KeyedService* ExtensionWarningBadgeServiceFactory::BuildServiceInstanceFor(
- BrowserContext* context) const {
- return new ExtensionWarningBadgeService(static_cast<Profile*>(context));
-}
-
-BrowserContext* ExtensionWarningBadgeServiceFactory::GetBrowserContextToUse(
- BrowserContext* context) const {
- // Redirected in incognito.
- return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
-}
-
-bool ExtensionWarningBadgeServiceFactory::ServiceIsCreatedWithBrowserContext()
- const {
- return true;
-}
-
-} // namespace extensions
diff --git a/chrome/browser/extensions/extension_warning_badge_service.cc b/chrome/browser/extensions/warning_badge_service.cc
similarity index 75%
rename from chrome/browser/extensions/extension_warning_badge_service.cc
rename to chrome/browser/extensions/warning_badge_service.cc
index 7afb6fc..a3358ec6 100644
--- a/chrome/browser/extensions/extension_warning_badge_service.cc
+++ b/chrome/browser/extensions/warning_badge_service.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/extension_warning_badge_service.h"
+#include "chrome/browser/extensions/warning_badge_service.h"
#include "base/stl_util.h"
#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/extensions/extension_warning_badge_service_factory.h"
+#include "chrome/browser/extensions/warning_badge_service_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/global_error/global_error.h"
@@ -23,7 +23,7 @@
// is redirected to chrome://extensions to inspect the errors.
class ErrorBadge : public GlobalError {
public:
- explicit ErrorBadge(ExtensionWarningBadgeService* badge_service);
+ explicit ErrorBadge(WarningBadgeService* badge_service);
~ErrorBadge() override;
// Implementation for GlobalError:
@@ -40,15 +40,17 @@
static int GetMenuItemCommandID();
private:
- ExtensionWarningBadgeService* badge_service_;
+ WarningBadgeService* badge_service_;
DISALLOW_COPY_AND_ASSIGN(ErrorBadge);
};
-ErrorBadge::ErrorBadge(ExtensionWarningBadgeService* badge_service)
- : badge_service_(badge_service) {}
+ErrorBadge::ErrorBadge(WarningBadgeService* badge_service)
+ : badge_service_(badge_service) {
+}
-ErrorBadge::~ErrorBadge() {}
+ErrorBadge::~ErrorBadge() {
+}
bool ErrorBadge::HasMenuItem() {
return true;
@@ -70,11 +72,17 @@
chrome::ExecuteCommand(browser, IDC_MANAGE_EXTENSIONS);
}
-bool ErrorBadge::HasBubbleView() { return false; }
+bool ErrorBadge::HasBubbleView() {
+ return false;
+}
-bool ErrorBadge::HasShownBubbleView() { return false; }
+bool ErrorBadge::HasShownBubbleView() {
+ return false;
+}
-void ErrorBadge::ShowBubbleView(Browser* browser) { NOTREACHED(); }
+void ErrorBadge::ShowBubbleView(Browser* browser) {
+ NOTREACHED();
+}
GlobalErrorBubbleViewBase* ErrorBadge::GetBubbleView() {
return NULL;
@@ -87,21 +95,22 @@
} // namespace
-ExtensionWarningBadgeService::ExtensionWarningBadgeService(Profile* profile)
+WarningBadgeService::WarningBadgeService(Profile* profile)
: profile_(profile), warning_service_observer_(this) {
DCHECK(CalledOnValidThread());
warning_service_observer_.Add(WarningService::Get(profile_));
}
-ExtensionWarningBadgeService::~ExtensionWarningBadgeService() {}
-
-// static
-ExtensionWarningBadgeService* ExtensionWarningBadgeService::Get(
- content::BrowserContext* context) {
- return ExtensionWarningBadgeServiceFactory::GetForBrowserContext(context);
+WarningBadgeService::~WarningBadgeService() {
}
-void ExtensionWarningBadgeService::SuppressCurrentWarnings() {
+// static
+WarningBadgeService* WarningBadgeService::Get(
+ content::BrowserContext* context) {
+ return WarningBadgeServiceFactory::GetForBrowserContext(context);
+}
+
+void WarningBadgeService::SuppressCurrentWarnings() {
DCHECK(CalledOnValidThread());
size_t old_size = suppressed_warnings_.size();
@@ -112,16 +121,16 @@
UpdateBadgeStatus();
}
-const WarningSet& ExtensionWarningBadgeService::GetCurrentWarnings() const {
+const WarningSet& WarningBadgeService::GetCurrentWarnings() const {
return WarningService::Get(profile_)->warnings();
}
-void ExtensionWarningBadgeService::ExtensionWarningsChanged() {
+void WarningBadgeService::ExtensionWarningsChanged() {
DCHECK(CalledOnValidThread());
UpdateBadgeStatus();
}
-void ExtensionWarningBadgeService::UpdateBadgeStatus() {
+void WarningBadgeService::UpdateBadgeStatus() {
const std::set<Warning>& warnings = GetCurrentWarnings();
bool non_suppressed_warnings_exist = false;
for (std::set<Warning>::const_iterator i = warnings.begin();
@@ -134,7 +143,7 @@
ShowBadge(non_suppressed_warnings_exist);
}
-void ExtensionWarningBadgeService::ShowBadge(bool show) {
+void WarningBadgeService::ShowBadge(bool show) {
GlobalErrorService* service =
GlobalErrorServiceFactory::GetForProfile(profile_);
GlobalError* error = service->GetGlobalErrorByMenuItemCommandID(
diff --git a/chrome/browser/extensions/extension_warning_badge_service.h b/chrome/browser/extensions/warning_badge_service.h
similarity index 74%
rename from chrome/browser/extensions/extension_warning_badge_service.h
rename to chrome/browser/extensions/warning_badge_service.h
index 2117683..ebd075c3 100644
--- a/chrome/browser/extensions/extension_warning_badge_service.h
+++ b/chrome/browser/extensions/warning_badge_service.h
@@ -11,22 +11,20 @@
#include "extensions/browser/warning_service.h"
#include "extensions/browser/warning_set.h"
-// TODO(battre): Rename ExtensionWarningBadgeService to WarningBadgeService.
-
class Profile;
namespace extensions {
// A service that is responsible for showing an extension warning badge on the
// wrench menu.
-class ExtensionWarningBadgeService : public KeyedService,
- public WarningService::Observer,
- public base::NonThreadSafe {
+class WarningBadgeService : public KeyedService,
+ public WarningService::Observer,
+ public base::NonThreadSafe {
public:
- explicit ExtensionWarningBadgeService(Profile* profile);
- ~ExtensionWarningBadgeService() override;
+ explicit WarningBadgeService(Profile* profile);
+ ~WarningBadgeService() override;
- static ExtensionWarningBadgeService* Get(content::BrowserContext* context);
+ static WarningBadgeService* Get(content::BrowserContext* context);
// Black lists all currently active extension warnings, so that they do not
// trigger a warning badge again for the life-time of the browsing session.
@@ -51,7 +49,7 @@
// Warnings that do not trigger a badge on the wrench menu.
WarningSet suppressed_warnings_;
- DISALLOW_COPY_AND_ASSIGN(ExtensionWarningBadgeService);
+ DISALLOW_COPY_AND_ASSIGN(WarningBadgeService);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/warning_badge_service_factory.cc b/chrome/browser/extensions/warning_badge_service_factory.cc
new file mode 100644
index 0000000..7917112
--- /dev/null
+++ b/chrome/browser/extensions/warning_badge_service_factory.cc
@@ -0,0 +1,54 @@
+// Copyright 2014 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/browser/extensions/warning_badge_service_factory.h"
+
+#include "chrome/browser/extensions/warning_badge_service.h"
+#include "chrome/browser/profiles/profile.h"
+#include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "extensions/browser/extensions_browser_client.h"
+#include "extensions/browser/warning_service_factory.h"
+
+using content::BrowserContext;
+
+namespace extensions {
+
+// static
+WarningBadgeService* WarningBadgeServiceFactory::GetForBrowserContext(
+ BrowserContext* context) {
+ return static_cast<WarningBadgeService*>(
+ GetInstance()->GetServiceForBrowserContext(context, true));
+}
+
+// static
+WarningBadgeServiceFactory* WarningBadgeServiceFactory::GetInstance() {
+ return Singleton<WarningBadgeServiceFactory>::get();
+}
+
+WarningBadgeServiceFactory::WarningBadgeServiceFactory()
+ : BrowserContextKeyedServiceFactory(
+ "WarningBadgeService",
+ BrowserContextDependencyManager::GetInstance()) {
+ DependsOn(WarningServiceFactory::GetInstance());
+}
+
+WarningBadgeServiceFactory::~WarningBadgeServiceFactory() {
+}
+
+KeyedService* WarningBadgeServiceFactory::BuildServiceInstanceFor(
+ BrowserContext* context) const {
+ return new WarningBadgeService(static_cast<Profile*>(context));
+}
+
+BrowserContext* WarningBadgeServiceFactory::GetBrowserContextToUse(
+ BrowserContext* context) const {
+ // Redirected in incognito.
+ return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
+}
+
+bool WarningBadgeServiceFactory::ServiceIsCreatedWithBrowserContext() const {
+ return true;
+}
+
+} // namespace extensions
diff --git a/chrome/browser/extensions/extension_warning_badge_service_factory.h b/chrome/browser/extensions/warning_badge_service_factory.h
similarity index 66%
rename from chrome/browser/extensions/extension_warning_badge_service_factory.h
rename to chrome/browser/extensions/warning_badge_service_factory.h
index 30a2e05..9d378e5 100644
--- a/chrome/browser/extensions/extension_warning_badge_service_factory.h
+++ b/chrome/browser/extensions/warning_badge_service_factory.h
@@ -10,20 +10,19 @@
namespace extensions {
-class ExtensionWarningBadgeService;
+class WarningBadgeService;
-class ExtensionWarningBadgeServiceFactory
- : public BrowserContextKeyedServiceFactory {
+class WarningBadgeServiceFactory : public BrowserContextKeyedServiceFactory {
public:
- static ExtensionWarningBadgeService* GetForBrowserContext(
+ static WarningBadgeService* GetForBrowserContext(
content::BrowserContext* context);
- static ExtensionWarningBadgeServiceFactory* GetInstance();
+ static WarningBadgeServiceFactory* GetInstance();
private:
- friend struct DefaultSingletonTraits<ExtensionWarningBadgeServiceFactory>;
+ friend struct DefaultSingletonTraits<WarningBadgeServiceFactory>;
- ExtensionWarningBadgeServiceFactory();
- ~ExtensionWarningBadgeServiceFactory() override;
+ WarningBadgeServiceFactory();
+ ~WarningBadgeServiceFactory() override;
// BrowserContextKeyedServiceFactory implementation
KeyedService* BuildServiceInstanceFor(
@@ -32,7 +31,7 @@
content::BrowserContext* context) const override;
bool ServiceIsCreatedWithBrowserContext() const override;
- DISALLOW_COPY_AND_ASSIGN(ExtensionWarningBadgeServiceFactory);
+ DISALLOW_COPY_AND_ASSIGN(WarningBadgeServiceFactory);
};
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_warning_badge_service_unittest.cc b/chrome/browser/extensions/warning_badge_service_unittest.cc
similarity index 77%
rename from chrome/browser/extensions/extension_warning_badge_service_unittest.cc
rename to chrome/browser/extensions/warning_badge_service_unittest.cc
index 8c533b92..168c494e 100644
--- a/chrome/browser/extensions/extension_warning_badge_service_unittest.cc
+++ b/chrome/browser/extensions/warning_badge_service_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/extension_warning_badge_service.h"
+#include "chrome/browser/extensions/warning_badge_service.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/profiles/profile.h"
@@ -19,8 +19,8 @@
class TestExtensionWarningSet : public WarningService {
public:
- explicit TestExtensionWarningSet(Profile* profile) : WarningService(profile) {
- }
+ explicit TestExtensionWarningSet(Profile* profile)
+ : WarningService(profile) {}
~TestExtensionWarningSet() override {}
void AddWarning(const Warning& warning) {
@@ -30,13 +30,11 @@
}
};
-class TestExtensionWarningBadgeService : public ExtensionWarningBadgeService {
+class TestWarningBadgeService : public WarningBadgeService {
public:
- TestExtensionWarningBadgeService(Profile* profile,
- WarningService* warning_service)
- : ExtensionWarningBadgeService(profile),
- warning_service_(warning_service) {}
- ~TestExtensionWarningBadgeService() override {}
+ TestWarningBadgeService(Profile* profile, WarningService* warning_service)
+ : WarningBadgeService(profile), warning_service_(warning_service) {}
+ ~TestWarningBadgeService() override {}
const std::set<Warning>& GetCurrentWarnings() const override {
return warning_service_->warnings();
@@ -50,7 +48,7 @@
GlobalErrorService* service =
GlobalErrorServiceFactory::GetForProfile(profile);
return service->GetGlobalErrorByMenuItemCommandID(IDC_EXTENSION_ERRORS) !=
- NULL;
+ NULL;
}
const char ext1_id[] = "extension1";
@@ -60,10 +58,10 @@
// Check that no badge appears if it has been suppressed for a specific
// warning.
-TEST(ExtensionWarningBadgeServiceTest, SuppressBadgeForCurrentWarnings) {
+TEST(WarningBadgeServiceTest, SuppressBadgeForCurrentWarnings) {
TestingProfile profile;
TestExtensionWarningSet warnings(&profile);
- TestExtensionWarningBadgeService badge_service(&profile, &warnings);
+ TestWarningBadgeService badge_service(&profile, &warnings);
warnings.AddObserver(&badge_service);
// Insert first warning.
@@ -91,4 +89,4 @@
warnings.RemoveObserver(&badge_service);
}
-} // namespace extensions
+} // namespace extensions
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 0d8eec1..e8b7998 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -642,10 +642,6 @@
'browser/extensions/extension_view_host_factory.h',
'browser/extensions/extension_view_host_mac.h',
'browser/extensions/extension_view_host_mac.mm',
- 'browser/extensions/extension_warning_badge_service.cc',
- 'browser/extensions/extension_warning_badge_service.h',
- 'browser/extensions/extension_warning_badge_service_factory.cc',
- 'browser/extensions/extension_warning_badge_service_factory.h',
'browser/extensions/extension_web_ui.cc',
'browser/extensions/extension_web_ui.h',
'browser/extensions/extension_web_ui_override_registrar.cc',
@@ -761,6 +757,10 @@
'browser/extensions/updater/extension_updater.h',
'browser/extensions/user_script_listener.cc',
'browser/extensions/user_script_listener.h',
+ 'browser/extensions/warning_badge_service.cc',
+ 'browser/extensions/warning_badge_service.h',
+ 'browser/extensions/warning_badge_service_factory.cc',
+ 'browser/extensions/warning_badge_service_factory.h',
'browser/extensions/webstore_data_fetcher.cc',
'browser/extensions/webstore_data_fetcher.h',
'browser/extensions/webstore_data_fetcher_delegate.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 371ce1eb..5f96c317 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -762,7 +762,6 @@
'browser/extensions/extension_toolbar_model_unittest.cc',
'browser/extensions/extension_ui_unittest.cc',
'browser/extensions/extension_user_script_loader_unittest.cc',
- 'browser/extensions/extension_warning_badge_service_unittest.cc',
'browser/extensions/extension_web_ui_unittest.cc',
'browser/extensions/external_policy_loader_unittest.cc',
'browser/extensions/external_provider_impl_chromeos_unittest.cc',
@@ -783,6 +782,7 @@
'browser/extensions/updater/extension_cache_fake.h',
'browser/extensions/updater/extension_updater_unittest.cc',
'browser/extensions/user_script_listener_unittest.cc',
+ 'browser/extensions/warning_badge_service_unittest.cc',
'browser/extensions/webstore_inline_installer_unittest.cc',
'browser/extensions/webstore_installer_unittest.cc',
'browser/extensions/zipfile_installer_unittest.cc',
