Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: chrome/browser/extensions/extension_warning_badge_service.cc

Issue 503033002: Move ExtensionWarningService and ExtensionsWarningSet to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@3_web_view_internal
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/extension_warning_badge_service.h" 5 #include "chrome/browser/extensions/extension_warning_badge_service.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser_commands.h" 10 #include "chrome/browser/ui/browser_commands.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 : profile_(profile) { 92 : profile_(profile) {
93 DCHECK(CalledOnValidThread()); 93 DCHECK(CalledOnValidThread());
94 } 94 }
95 95
96 ExtensionWarningBadgeService::~ExtensionWarningBadgeService() {} 96 ExtensionWarningBadgeService::~ExtensionWarningBadgeService() {}
97 97
98 void ExtensionWarningBadgeService::SuppressCurrentWarnings() { 98 void ExtensionWarningBadgeService::SuppressCurrentWarnings() {
99 DCHECK(CalledOnValidThread()); 99 DCHECK(CalledOnValidThread());
100 size_t old_size = suppressed_warnings_.size(); 100 size_t old_size = suppressed_warnings_.size();
101 101
102 const ExtensionWarningSet& warnings = GetCurrentWarnings(); 102 const WarningSet& warnings = GetCurrentWarnings();
103 suppressed_warnings_.insert(warnings.begin(), warnings.end()); 103 suppressed_warnings_.insert(warnings.begin(), warnings.end());
104 104
105 if (old_size != suppressed_warnings_.size()) 105 if (old_size != suppressed_warnings_.size())
106 UpdateBadgeStatus(); 106 UpdateBadgeStatus();
107 } 107 }
108 108
109 const ExtensionWarningSet& 109 const WarningSet& ExtensionWarningBadgeService::GetCurrentWarnings() const {
110 ExtensionWarningBadgeService::GetCurrentWarnings() const {
111 return ExtensionSystem::Get(profile_)->warning_service()->warnings(); 110 return ExtensionSystem::Get(profile_)->warning_service()->warnings();
112 } 111 }
113 112
114 void ExtensionWarningBadgeService::ExtensionWarningsChanged() { 113 void ExtensionWarningBadgeService::ExtensionWarningsChanged() {
115 DCHECK(CalledOnValidThread()); 114 DCHECK(CalledOnValidThread());
116 UpdateBadgeStatus(); 115 UpdateBadgeStatus();
117 } 116 }
118 117
119 void ExtensionWarningBadgeService::UpdateBadgeStatus() { 118 void ExtensionWarningBadgeService::UpdateBadgeStatus() {
120 const std::set<ExtensionWarning>& warnings = GetCurrentWarnings(); 119 const std::set<Warning>& warnings = GetCurrentWarnings();
121 bool non_suppressed_warnings_exist = false; 120 bool non_suppressed_warnings_exist = false;
122 for (std::set<ExtensionWarning>::const_iterator i = warnings.begin(); 121 for (std::set<Warning>::const_iterator i = warnings.begin();
123 i != warnings.end(); ++i) { 122 i != warnings.end(); ++i) {
124 if (!ContainsKey(suppressed_warnings_, *i)) { 123 if (!ContainsKey(suppressed_warnings_, *i)) {
125 non_suppressed_warnings_exist = true; 124 non_suppressed_warnings_exist = true;
126 break; 125 break;
127 } 126 }
128 } 127 }
129 ShowBadge(non_suppressed_warnings_exist); 128 ShowBadge(non_suppressed_warnings_exist);
130 } 129 }
131 130
132 void ExtensionWarningBadgeService::ShowBadge(bool show) { 131 void ExtensionWarningBadgeService::ShowBadge(bool show) {
133 GlobalErrorService* service = 132 GlobalErrorService* service =
134 GlobalErrorServiceFactory::GetForProfile(profile_); 133 GlobalErrorServiceFactory::GetForProfile(profile_);
135 GlobalError* error = service->GetGlobalErrorByMenuItemCommandID( 134 GlobalError* error = service->GetGlobalErrorByMenuItemCommandID(
136 ErrorBadge::GetMenuItemCommandID()); 135 ErrorBadge::GetMenuItemCommandID());
137 136
138 // Activate or hide the warning badge in case the current state is incorrect. 137 // Activate or hide the warning badge in case the current state is incorrect.
139 if (error && !show) { 138 if (error && !show) {
140 service->RemoveGlobalError(error); 139 service->RemoveGlobalError(error);
141 delete error; 140 delete error;
142 } else if (!error && show) { 141 } else if (!error && show) {
143 service->AddGlobalError(new ErrorBadge(this)); 142 service->AddGlobalError(new ErrorBadge(this));
144 } 143 }
145 } 144 }
146 145
147 } // namespace extensions 146 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698