Support reordering of Browser Actions within the container. Currently does no...

chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc

 // Copyright (c) 2010 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/views/extensions/browser_action_overflow_menu_controller.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/browser_actions_container.h"
@@ skipping 11 matching lines @@
       start_index_(start_index) {
   menu_.reset(new views::MenuItemView(this));
   menu_->set_has_icons(true);
 
   TabContents* tab = BrowserList::GetLastActive()->GetSelectedTabContents();
   int tab_id = tab->controller().session_id().id();
 
   size_t command_id = 0;
   for (size_t i = start_index; i < views_->size(); ++i) {
     BrowserActionView* view = (*views_)[i];
+    SkBitmap icon =
+        view->button()->extension()->browser_action()->GetIcon(tab_id);
+    if (icon.isNull())
+      icon = view->button()->default_icon();
     menu_->AppendMenuItemWithIcon(
         command_id,
         UTF8ToWide(view->button()->extension()->name()),
-        view->button()->extension()->browser_action()->GetIcon(tab_id));
+        icon);
     ++command_id;
   }
 }
 
 BrowserActionOverflowMenuController::~BrowserActionOverflowMenuController() {
 }
 
 bool BrowserActionOverflowMenuController::RunMenu(gfx::NativeWindow window) {
   gfx::Rect bounds = menu_button_->GetBounds(
       views::View::IGNORE_MIRRORING_TRANSFORMATION);
@@ skipping 27 matching lines @@
   // This blocks until the user choses something or dismisses.
   context_menu_->Run((*views_)[start_index_ + id]->button()->extension(),
                      gfx::Point(x, y));
 
   // The user is done with the context menu, so we can close the underlying
   // menu.
   menu_->Cancel();
 
   return true;
 }