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

chrome/browser/extensions/extension_context_menu_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_context_menu_model.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 76 matching lines @@
       browser_->OpenURL(params);
       break;
     }
     case CONFIGURE:
       DCHECK(!extension->options_url().is_empty());
       profile_->GetExtensionProcessManager()->OpenOptionsPage(extension,
                                                               browser_);
       break;
     case HIDE: {
       ExtensionService* extension_service = profile_->GetExtensionService();
-      extension_service->SetBrowserActionVisibility(extension, false);
+      extension_service->extension_prefs()->
+          SetBrowserActionVisibility(extension, false);
       break;
     }
     case DISABLE: {
       ExtensionService* extension_service = profile_->GetExtensionService();
       extension_service->DisableExtension(extension_id_,
                                           Extension::DISABLE_USER_ACTION);
       break;
     }
     case UNINSTALL: {
       AddRef();  // Balanced in Accepted() and Canceled()
@@ skipping 41 matching lines @@
   if (extension->browser_action())
     AddItemWithStringId(HIDE, IDS_EXTENSIONS_HIDE_BUTTON);
   AddSeparator();
   AddItemWithStringId(MANAGE, IDS_MANAGE_EXTENSIONS);
 }
 
 const Extension* ExtensionContextMenuModel::GetExtension() const {
   ExtensionService* extension_service = profile_->GetExtensionService();
   return extension_service->GetExtensionById(extension_id_, false);
 }