Revert 160886 - Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuCo…

chrome/browser/ui/views/action_box_menu.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/action_box_menu.h"
 
 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"
 #include "chrome/browser/ui/views/browser_action_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/button/menu_button.h"
-#include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/view.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 // Included for MENU_POPUPITEM and a few other Windows specific constants.
 #include <vssym32.h>
 #include "ui/base/native_theme/native_theme_win.h"
 #endif
 
 // static
@@ skipping 20 matching lines @@
                               views::MenuItemView::TOPRIGHT,
                               views::MenuRunner::HAS_MNEMONICS));
 }
 
 ActionBoxMenu::ActionBoxMenu(Browser* browser,
                              scoped_ptr<ActionBoxMenuModel> model)
     : browser_(browser),
       model_(model.Pass()) {
   views::MenuItemView* menu = new views::MenuItemView(this);
   menu->set_has_icons(true);
-
-  views::MenuConfig* menu_config = new views::MenuConfig();
-  CustomizeMenu(menu_config);
-  // |menu| will own MenuConfig
-  menu->set_menu_config(menu_config);
-
   menu_runner_.reset(new views::MenuRunner(menu));
 }
 
 void ActionBoxMenu::ExecuteCommand(int id) {
   model_->ExecuteCommand(id);
 }
 
 views::Border* ActionBoxMenu::CreateMenuBorder() {
   // TODO(yefim): Use correct theme color on non-Windows.
   SkColor border_color = SK_ColorBLACK;
@@ skipping 71 matching lines @@
         const extensions::Extension* extension =
             model_->GetExtensionAt(model_index);
         BrowserActionView* view = new BrowserActionView(extension,
             browser_, this);
         // |menu_item| will own the |view| from now on.
         menu_item->SetIconView(view);
       }
     }
   }
 }
-
-void ActionBoxMenu::CustomizeMenu(views::MenuConfig* menu_config) {
-  // TODO(yefim): add menu customization here.
-}