| Index: chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| index 05749038b30320a9e5821da5a94f42ec542ad9b0..6b0e8117e1f36c3fe007dffe5dae5f4797de955f 100644
|
| --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| @@ -345,26 +345,15 @@ void ToolbarView::ShowAppMenu(bool for_drop) {
|
| if (wrench_menu_.get() && wrench_menu_->IsShowing())
|
| return;
|
|
|
| - int run_flags = 0;
|
| - bool use_new_menu = false;
|
| - // TODO: remove this.
|
| -#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
|
| - if (GetNativeTheme() == ui::NativeThemeAura::instance()) {
|
| - use_new_menu = true;
|
| - run_flags |= WrenchMenu::SUPPORTS_NEW_SEPARATORS | WrenchMenu::USE_NEW_MENU;
|
| - }
|
| -#endif
|
| -
|
| if (keyboard::KeyboardController::GetInstance() &&
|
| keyboard::KeyboardController::GetInstance()->keyboard_visible()) {
|
| keyboard::KeyboardController::GetInstance()->HideKeyboard(
|
| keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
|
| }
|
|
|
| - if (for_drop)
|
| - run_flags |= WrenchMenu::FOR_DROP;
|
| - wrench_menu_.reset(new WrenchMenu(browser_, run_flags));
|
| - wrench_menu_model_.reset(new WrenchMenuModel(this, browser_, use_new_menu));
|
| + wrench_menu_.reset(
|
| + new WrenchMenu(browser_, for_drop ? WrenchMenu::FOR_DROP : 0));
|
| + wrench_menu_model_.reset(new WrenchMenuModel(this, browser_));
|
| wrench_menu_->Init(wrench_menu_model_.get());
|
|
|
| FOR_EACH_OBSERVER(views::MenuListener, menu_listeners_, OnMenuOpened());
|
|
|