ui/views/controls/menu/menu_config_views.cc - Issue 10387121: Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/menu/menu_config_views.cc

Issue 10387121: Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 7 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: ui/views/controls/menu/menu_config_views.cc

===================================================================

--- ui/views/controls/menu/menu_config_views.cc (revision 137002)

+++ ui/views/controls/menu/menu_config_views.cc (working copy)

@@ -6,17 +6,17 @@

#include "grit/ui_resources.h"

#include "third_party/skia/include/core/SkBitmap.h"

-#include "ui/base/native_theme/native_theme_aura.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/image/image.h"

+#include "ui/gfx/native_theme_aura.h"

namespace views {

// static

MenuConfig* MenuConfig::Create() {

MenuConfig* config = new MenuConfig();

- config->text_color = ui::NativeTheme::instance()->GetSystemColor(

- ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor);

+ config->text_color = gfx::NativeTheme::instance()->GetSystemColor(

+ gfx::NativeTheme::kColorId_EnabledMenuItemForegroundColor);

config->submenu_horizontal_margin_size = 0;

config->submenu_vertical_margin_size = 2;

config->submenu_horizontal_inset = 1;

« no previous file with comments | « ui/views/controls/label.cc ('k') | ui/views/controls/menu/menu_config_win.cc » ('j') | no next file with comments »