With enable-action-box add extensions to BrowserActionContainer only if they have preference kBrows…

chrome/browser/ui/webui/extensions/extension_settings_handler.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/ui/webui/extensions/extension_settings_handler.h"
 
 #include "base/auto_reset.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 114 matching lines @@
                              extension->GetHomepageURL().is_valid());
 
   // Determine the sort order: Extensions loaded through --load-extensions show
   // up at the top. Disabled extensions show up at the bottom.
   if (extension->location() == Extension::LOAD)
     extension_data->SetInteger("order", 1);
   else
     extension_data->SetInteger("order", 2);
 
   if (extension_service_ &&
-      !extension_service_->GetBrowserActionVisibility(extension)) {
+      !extension_service_->extension_prefs()->
+          GetBrowserActionVisibility(extension)) {
     extension_data->SetBoolean("enable_show_button", true);
   }
 
   // Add views
   ListValue* views = new ListValue;
   for (std::vector<ExtensionPage>::const_iterator iter = pages.begin();
        iter != pages.end(); ++iter) {
     DictionaryValue* view_value = new DictionaryValue;
     if (iter->url.scheme() == chrome::kExtensionScheme) {
       // No leading slash.
@@ skipping 513 matching lines @@
   if (!extension || extension->options_url().is_empty())
     return;
   Profile::FromWebUI(web_ui())->GetExtensionProcessManager()->OpenOptionsPage(
       extension, NULL);
 }
 
 void ExtensionSettingsHandler::HandleShowButtonMessage(const ListValue* args) {
   const Extension* extension = GetActiveExtension(args);
   if (!extension)
     return;
-  extension_service_->SetBrowserActionVisibility(extension, true);
+  extension_service_->extension_prefs()->
+      SetBrowserActionVisibility(extension, true);
 }
 
 void ExtensionSettingsHandler::HandleAutoUpdateMessage(const ListValue* args) {
   ExtensionUpdater* updater = extension_service_->updater();
   if (updater)
     updater->CheckNow();
 }
 
 void ExtensionSettingsHandler::HandleLoadUnpackedExtensionMessage(
     const ListValue* args) {
@@ skipping 140 matching lines @@
   return extension_uninstall_dialog_.get();
 #else
   return NULL;
 #endif  // !defined(OS_ANDROID)
 }
 
 void ExtensionSettingsHandler::InspectExtensionHost(ExtensionHost* host) {
   if (host)
     DevToolsWindow::OpenDevToolsWindow(host->render_view_host());
 }