Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / extension_warning_badge_service.cc

diff --git a/src/chrome/browser/extensions/extension_warning_badge_service.cc b/src/chrome/browser/extensions/extension_warning_badge_service.cc
index 557d23e..b34ad6b 100644 (file)
--- a/src/chrome/browser/extensions/extension_warning_badge_service.cc
+++ b/src/chrome/browser/extensions/extension_warning_badge_service.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
+#include "chrome/grit/generated_resources.h"
 #include "extensions/browser/extension_system.h"
-#include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
@@ -99,15 +99,14 @@ void ExtensionWarningBadgeService::SuppressCurrentWarnings() {
   DCHECK(CalledOnValidThread());
   size_t old_size = suppressed_warnings_.size();
 
-  const ExtensionWarningSet& warnings = GetCurrentWarnings();
+  const WarningSet& warnings = GetCurrentWarnings();
   suppressed_warnings_.insert(warnings.begin(), warnings.end());
 
   if (old_size != suppressed_warnings_.size())
     UpdateBadgeStatus();
 }
 
-const ExtensionWarningSet&
-ExtensionWarningBadgeService::GetCurrentWarnings() const {
+const WarningSet& ExtensionWarningBadgeService::GetCurrentWarnings() const {
   return ExtensionSystem::Get(profile_)->warning_service()->warnings();
 }
 
@@ -117,9 +116,9 @@ void ExtensionWarningBadgeService::ExtensionWarningsChanged() {
 }
 
 void ExtensionWarningBadgeService::UpdateBadgeStatus() {
-  const std::set<ExtensionWarning>& warnings = GetCurrentWarnings();
+  const std::set<Warning>& warnings = GetCurrentWarnings();
   bool non_suppressed_warnings_exist = false;
-  for (std::set<ExtensionWarning>::const_iterator i = warnings.begin();
+  for (std::set<Warning>::const_iterator i = warnings.begin();
        i != warnings.end(); ++i) {
     if (!ContainsKey(suppressed_warnings_, *i)) {
       non_suppressed_warnings_exist = true;