Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7826)

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_view.cc

Issue 431473003: Make all views platforms use 'new' (cros-style) wrench menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile errors Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());
« no previous file with comments | « chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc ('k') | chrome/browser/ui/views/toolbar/wrench_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698