Setting the touch wrench menu as default menu for ChromeOS

ui/views/controls/menu/menu_config.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 "ui/views/controls/menu/menu_config.h"
 
 #include "build/build_config.h"
 #include "ui/base/layout.h"
 
 namespace views {
@@ skipping 15 matching lines @@
       icon_to_label_padding(8),
       gutter_to_label(5),
       check_width(16),
       check_height(16),
       radio_width(16),
       radio_height(16),
       arrow_height(9),
       arrow_width(9),
       gutter_width(0),
       separator_height(6),
+      separator_upper_height(3),
+      separator_lower_height(4),
+      separator_spacing_height(3),
       render_gutter(false),
       show_mnemonics(false),
       scroll_arrow_height(3),
       label_to_accelerator_padding(10),
       item_min_height(0),
       show_accelerators(true),
       always_use_icon_to_label_padding(false),
       align_arrow_and_shortcut(false) {
-  // Use 40px tall menu items when running in touch optimized mode.
+#if defined (OS_WIN)

[sky, 2012/08/21 19:36:29]

Do you even need the ifdef here? We don't use ui::LAYOUT_TOUCH on chromeos
anymore.

[Mr4D (OOO till 08-26), 2012/08/21 21:34:54]

Well - fact wise you are right, but the code itself makes only sense for Windows
and it will be confusing for people looking at it otherwise. (not even
mentioning that it adds additional unneeded complexity). If you insist I remove
it of course.

+  // For Windows use 40px tall menu items when running in touch optimized mode.
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
     item_top_margin = item_no_icon_top_margin = 12;
     item_bottom_margin = item_no_icon_bottom_margin = 13;
   }
+#endif
 }
 
 MenuConfig::~MenuConfig() {}
 
 void MenuConfig::Reset() {
   delete config_instance;
   config_instance = NULL;
 }
 
 // static
 const MenuConfig& MenuConfig::instance() {
   if (!config_instance)
     config_instance = Create();
   return *config_instance;
 }
 
+// static
+const bool MenuConfig::IsNewMenu() {
+#if defined(USE_AURA)
+  return true;
+#else
+  return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH;

[sky, 2012/08/21 19:36:29]

Why do we need this else?

[Mr4D (OOO till 08-26), 2012/08/21 21:34:54]

Because I was told that for all other operating systems we want to keep
everything as it is. The lengthy comment for this function (which I have just
removed) was trying to explain this: I was told that for ChromeOS we always want
to have the new menu style, but for the moment we want to keep the menu for all
other OS'ses as it is. There were many eMails around this topic. So we should
really keep it as such...

+#endif
+}
+
+
 }  // namespace views