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

Unified Diff: views/controls/menu/menu_config_linux.cc

Issue 8621006: Remove most obvious TOUCH_UI code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert file that CQ does not like. Created 9 years, 1 month 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
« no previous file with comments | « views/controls/menu/menu_config_aura.cc ('k') | views/controls/menu/menu_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_config_linux.cc
diff --git a/views/controls/menu/menu_config_linux.cc b/views/controls/menu/menu_config_linux.cc
index d0aca45237cd9b0821f4c062e28759817ee04840..298f92408ee28a9b855a311e0f94da3068fce684 100644
--- a/views/controls/menu/menu_config_linux.cc
+++ b/views/controls/menu/menu_config_linux.cc
@@ -14,12 +14,7 @@ namespace views {
MenuConfig* MenuConfig::Create() {
MenuConfig* config = new MenuConfig();
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-#if defined(TOUCH_UI)
- config->font = rb.GetFont(ResourceBundle::LargeFont);
- config->show_accelerators = false;
-#else
config->font = rb.GetFont(ResourceBundle::BaseFont);
-#endif
config->arrow_width = rb.GetBitmapNamed(IDR_MENU_ARROW)->width();
// Add 4 to force some padding between check and label.
config->check_width = rb.GetBitmapNamed(IDR_MENU_CHECK)->width() + 4;
« no previous file with comments | « views/controls/menu/menu_config_aura.cc ('k') | views/controls/menu/menu_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698