Setting the touch wrench menu as default menu for ChromeOS

ui/base/native_theme/native_theme_aura.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/base/native_theme/native_theme_aura.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
+#include "ui/views/controls/menu/menu_config.h"
 
 namespace {
 
 const SkColor kMenuBackgroundColor = SK_ColorWHITE;
 
 // Theme colors returned by GetSystemColor().
 const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
 // Dialogs:
 const SkColor kDialogBackgroundColor = SK_ColorWHITE;
 // FocusableBorder:
@@ skipping 75 matching lines @@
       return kTextButtonHoverColor;
 
     // MenuItem
     case kColorId_EnabledMenuItemForegroundColor:
       return kEnabledMenuItemForegroundColor;
     case kColorId_DisabledMenuItemForegroundColor:
       return kDisabledMenuItemForegroundColor;
     case kColorId_FocusedMenuItemBackgroundColor:
       return kFocusedMenuItemBackgroundColor;
     case kColorId_MenuSeparatorColor:
-      return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH ?
+      return views::MenuConfig::IsNewMenu() ?
                  kMenuSeparatorColorTouch : kMenuSeparatorColor;
 
     // Label
     case kColorId_LabelEnabledColor:
       return kLabelEnabledColor;
     case kColorId_LabelDisabledColor:
       return kLabelDisabledColor;
     case kColorId_LabelBackgroundColor:
       return kLabelBackgroundColor;
 
@@ skipping 176 matching lines @@
       DrawTiledImage(canvas, *center,
                      0, 0, 1.0, 1.0,
                      rect.x() + left->width(), rect.y(),
                      rect.width() - left->width() - right->width(),
                      center->height());
     }
   }
 }
 
 }  // namespace ui