| Index: ui/views/controls/menu/menu_config_aura.cc
|
| diff --git a/ui/views/controls/menu/menu_config_aura.cc b/ui/views/controls/menu/menu_config_aura.cc
|
| deleted file mode 100644
|
| index a49d44744a6ce369d6ddfec4e646193a512a9713..0000000000000000000000000000000000000000
|
| --- a/ui/views/controls/menu/menu_config_aura.cc
|
| +++ /dev/null
|
| @@ -1,64 +0,0 @@
|
| -// Copyright 2014 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 "ui/base/layout.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
| -#include "ui/gfx/image/image.h"
|
| -#include "ui/gfx/image/image_skia.h"
|
| -#include "ui/native_theme/native_theme_aura.h"
|
| -#include "ui/resources/grit/ui_resources.h"
|
| -#include "ui/views/controls/menu/menu_image_util.h"
|
| -#include "ui/views/resources/grit/views_resources.h"
|
| -
|
| -namespace views {
|
| -
|
| -namespace {
|
| -#if defined(OS_CHROMEOS)
|
| -static const int kMenuCornerRadiusForAura = 2;
|
| -#else
|
| -static const int kMenuCornerRadiusForAura = 0;
|
| -#endif
|
| -} // namespace
|
| -
|
| -#if !defined(OS_WIN)
|
| -void MenuConfig::Init(const ui::NativeTheme* theme) {
|
| - if (theme == ui::NativeThemeAura::instance())
|
| - InitAura(theme);
|
| -}
|
| -#endif
|
| -
|
| -void MenuConfig::InitAura(const ui::NativeTheme* theme) {
|
| - submenu_horizontal_inset = 1;
|
| - arrow_to_edge_padding = 20;
|
| - ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| - arrow_width = rb.GetImageNamed(IDR_MENU_HIERARCHY_ARROW).Width();
|
| - gfx::ImageSkia check = GetMenuCheckImage(false);
|
| - check_height = check.height();
|
| - item_min_height = 29;
|
| - separator_spacing_height = 7;
|
| - separator_lower_height = 8;
|
| - separator_upper_height = 8;
|
| - label_to_arrow_padding = 20;
|
| - label_to_minor_text_padding = 20;
|
| - always_use_icon_to_label_padding = true;
|
| - align_arrow_and_shortcut = true;
|
| - offset_context_menus = true;
|
| - corner_radius = kMenuCornerRadiusForAura;
|
| -
|
| - // In Ash, the border is provided by the shadow.
|
| - use_outer_border = false;
|
| -}
|
| -
|
| -#if !defined(OS_WIN)
|
| -// static
|
| -const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {
|
| - CR_DEFINE_STATIC_LOCAL(MenuConfig, instance,
|
| - (theme ? theme : ui::NativeThemeAura::instance()));
|
| - return instance;
|
| -}
|
| -#endif
|
| -
|
| -} // namespace views
|
|
|