Pop extensions out of the action overflow menu

chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.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/views/extensions/browser_action_overflow_menu_controller.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
@@ skipping 209 matching lines @@
     return ui::DragDropTypes::DRAG_NONE;
 
   size_t drop_index = IndexForId(menu->GetCommand());
 
   // When not dragging within the overflow menu (dragging an icon into the menu)
   // subtract one to get the right index.
   if (position == DROP_BEFORE &&
       drop_data.index() < owner_->VisibleBrowserActions())
     --drop_index;
 
+  // Move the extension in the model.
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(browser_->profile())->
           enabled_extensions().GetByID(drop_data.id());
-  extensions::ExtensionToolbarModel::Get(browser_->profile())->
-      MoveExtensionIcon(extension, drop_index);
+  extensions::ExtensionToolbarModel* toolbar_model =
+      extensions::ExtensionToolbarModel::Get(browser_->profile());
+  if (browser_->profile()->IsOffTheRecord())
+    drop_index = toolbar_model->IncognitoIndexToOriginal(drop_index);
+  toolbar_model->MoveExtensionIcon(extension, drop_index);
+
+  // If the extension was moved to the overflow menu from the main bar, notify
+  // the owner.
+  if (drop_index >= owner_->VisibleBrowserActions())
+    owner_->NotifyActionMovedToOverflow();
 
   if (for_drop_)
     delete this;
   return ui::DragDropTypes::DRAG_MOVE;
 }
 
 bool BrowserActionOverflowMenuController::CanDrag(views::MenuItemView* menu) {
   return true;
 }
 
 void BrowserActionOverflowMenuController::WriteDragData(
     views::MenuItemView* sender, OSExchangeData* data) {
   size_t drag_index = IndexForId(sender->GetCommand());
   const extensions::Extension* extension = views_[drag_index]->extension();
   BrowserActionDragData drag_data(extension->id(), drag_index);
   drag_data.Write(owner_->profile(), data);
 }
 
 int BrowserActionOverflowMenuController::GetDragOperations(
     views::MenuItemView* sender) {
   return ui::DragDropTypes::DRAG_MOVE;
 }
 
 size_t BrowserActionOverflowMenuController::IndexForId(int id) const {
   // The index of the view being dragged (GetCommand gives a 1-based index into
   // the overflow menu).
   DCHECK_GT(owner_->VisibleBrowserActions() + id, 0u);
   return owner_->VisibleBrowserActions() + id - 1;
 }