summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_toolbar_model.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 22:07:35 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 22:07:35 +0000
commitc3cfb01fb895eb5a6063193456e51c2bb71a1e29 (patch)
tree1fd723d2b1fea517acbaf35f976e91bae9523caf /chrome/browser/extensions/extension_toolbar_model.cc
parent2831638398f9ab2b991009c1e380395758c98e60 (diff)
downloadchromium_src-c3cfb01fb895eb5a6063193456e51c2bb71a1e29.zip
chromium_src-c3cfb01fb895eb5a6063193456e51c2bb71a1e29.tar.gz
chromium_src-c3cfb01fb895eb5a6063193456e51c2bb71a1e29.tar.bz2
Refactor ExtensionService/ExtensionServiceInterface to be more testable
In particular: - Add various status accessors to ExtensionServiceInterface (e.g., IsExtensionEnabled()) - Convert IsIncognitoEnabled() to take an ID instead of an Extension*. - Add CheckForUpdates() to ExtensionServiceInterface. - Remove various unneeded accessors from ExtensionServiceInterface. Rewrite some sync utility functions to take advantage of the new interface (although it will be rewritten more in a future CL). BUG=77995 TEST= Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=80539 Review URL: http://codereview.chromium.org/6720042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_toolbar_model.cc')
-rw-r--r--chrome/browser/extensions/extension_toolbar_model.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc
index 11bfeb7..1c3a403 100644
--- a/chrome/browser/extensions/extension_toolbar_model.cc
+++ b/chrome/browser/extensions/extension_toolbar_model.cc
@@ -238,7 +238,7 @@ int ExtensionToolbarModel::IncognitoIndexToOriginal(int incognito_index) {
int original_index = 0, i = 0;
for (ExtensionList::iterator iter = begin(); iter != end();
++iter, ++original_index) {
- if (service_->IsIncognitoEnabled(*iter)) {
+ if (service_->IsIncognitoEnabled((*iter)->id())) {
if (incognito_index == i)
break;
++i;
@@ -253,7 +253,7 @@ int ExtensionToolbarModel::OriginalIndexToIncognito(int original_index) {
++iter, ++i) {
if (original_index == i)
break;
- if (service_->IsIncognitoEnabled(*iter))
+ if (service_->IsIncognitoEnabled((*iter)->id()))
++incognito_index;
}
return incognito_index;