Move BrowserAction references from ExtensionPrefs to ExtensionActionAPI

chrome/browser/extensions/extension_toolbar_model.cc

 // Copyright (c) 2012 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_toolbar_model.h"
 
 #include "base/prefs/pref_service.h"
+#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/browser_event_router.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 161 matching lines @@
     extension = content::Details<const Extension>(details).ptr();
   }
   if (type == chrome::NOTIFICATION_EXTENSION_LOADED) {
     // We don't want to add the same extension twice. It may have already been
     // added by EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED below, if the user
     // hides the browser action and then disables and enables the extension.
     for (size_t i = 0; i < toolbar_items_.size(); i++) {
       if (toolbar_items_[i].get() == extension)
         return;  // Already exists.
     }
-    if (service_->extension_prefs()->GetBrowserActionVisibility(extension))
+    if (extensions::ExtensionActionAPI::GetBrowserActionVisibility(
+            service_->extension_prefs(), extension->id())) {
       AddExtension(extension);
+    }
   } else if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED) {
     RemoveExtension(extension);
   } else if (type == chrome::NOTIFICATION_EXTENSION_UNINSTALLED) {
     UninstalledExtension(extension);
   } else if (type ==
       chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED) {
-    if (service_->extension_prefs()->GetBrowserActionVisibility(extension))
+    if (extensions::ExtensionActionAPI::GetBrowserActionVisibility(
+            service_->extension_prefs(), extension->id())) {
       AddExtension(extension);
-    else
+    } else {
       RemoveExtension(extension);
+    }
   } else {
     NOTREACHED() << "Received unexpected notification";
   }
 }
 
 size_t ExtensionToolbarModel::FindNewPositionFromLastKnownGood(
     const Extension* extension) {
   // See if we have last known good position for this extension.
   size_t new_index = 0;
   // Loop through the ID list of known positions, to count the number of visible
@@ skipping 106 matching lines @@
 
   extensions::ExtensionActionManager* extension_action_manager =
       extensions::ExtensionActionManager::Get(service_->profile());
 
   // Create the lists.
   for (ExtensionSet::const_iterator it = service_->extensions()->begin();
        it != service_->extensions()->end(); ++it) {
     const Extension* extension = *it;
     if (!extension_action_manager->GetBrowserAction(*extension))
       continue;
-    if (!service_->extension_prefs()->GetBrowserActionVisibility(extension))
+    if (!extensions::ExtensionActionAPI::GetBrowserActionVisibility(
+            service_->extension_prefs(), extension->id())) {
       continue;
+    }
 
     extensions::ExtensionIdList::const_iterator pos =
         std::find(pref_order.begin(), pref_order.end(), extension->id());
     if (pos != pref_order.end())
       sorted[pos - pref_order.begin()] = extension;
     else
       unsorted.push_back(make_scoped_refptr(extension));
   }
 
   // Merge the lists.
@@ skipping 58 matching lines @@
   for (ExtensionList::iterator iter = toolbar_items_.begin();
        iter != toolbar_items_.end();
        ++iter, ++i) {
     if (original_index == i)
       break;
     if (service_->IsIncognitoEnabled((*iter)->id()))
       ++incognito_index;
   }
   return incognito_index;
 }