Added flag --extensions-in-action-box to split Action Box and Extensions in it.

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 "chrome/browser/extensions/browser_event_router.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 149 matching lines @@
   } else {
     extension = content::Details<const Extension>(details).ptr();
   }
   ExtensionList* list_with_extension = FindListWithExtension(extension);
   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.
     if (list_with_extension)
       return;
-    if (extensions::switch_utils::IsActionBoxEnabled())
+    if (extensions::switch_utils::IsExtensionsInActionBoxEnabled())
       AddExtension(extension, &action_box_menu_items_);
     else if (service_->extension_prefs()->GetBrowserActionVisibility(extension))
       AddExtension(extension, &toolbar_items_);
   } else if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED) {
     if (list_with_extension)
       RemoveExtension(extension, list_with_extension);
   } else if (type ==
       chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED) {
-    if (extensions::switch_utils::IsActionBoxEnabled()) {
+    if (extensions::switch_utils::IsExtensionsInActionBoxEnabled()) {
       // TODO(yefim): Implement this when implementing drag & drop
       // for action box menu.
     } else if (
       service_->extension_prefs()->GetBrowserActionVisibility(extension)) {
       AddExtension(extension, &toolbar_items_);
     } else {
       RemoveExtension(extension, &toolbar_items_);
     }
   } else {
     NOTREACHED() << "Received unexpected notification";
@@ skipping 53 matching lines @@
 // Combine the currently enabled extensions that have browser actions (which
 // we get from the ExtensionService) with the ordering we get from the
 // pref service. For robustness we use a somewhat inefficient process:
 // 1. Create a vector of extensions sorted by their pref values. This vector may
 // have holes.
 // 2. Create a vector of extensions that did not have a pref value.
 // 3. Remove holes from the sorted vector and append the unsorted vector.
 void ExtensionToolbarModel::InitializeExtensionLists() {
   DCHECK(service_->is_ready());
 
-  if (extensions::switch_utils::IsActionBoxEnabled())
+  if (extensions::switch_utils::IsExtensionsInActionBoxEnabled())
     PopulateForActionBoxMode();
   else
     PopulateForNonActionBoxMode();
 
   UpdatePrefs();
 
   extensions_initialized_ = true;
   FOR_EACH_OBSERVER(Observer, observers_, ModelLoaded());
 }
 
@@ skipping 125 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;
 }