ui/views/controls/menu/menu_scroll_view_container.cc - Issue 10310136: 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_scroll_view_container.cc

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

Patch Set: fix win 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:

Index: ui/views/controls/menu/menu_scroll_view_container.cc

diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc

index f8f36b846536f55d28fb042ec0a5fce66da36fb7..444232840d2e1c9104f53fc04a440599d8c23a6d 100644

--- a/ui/views/controls/menu/menu_scroll_view_container.cc

+++ b/ui/views/controls/menu/menu_scroll_view_container.cc

@@ -13,14 +13,14 @@

#include "ui/base/accessibility/accessible_view_state.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/color_utils.h"

-#include "ui/gfx/native_theme.h"

+#include "ui/base/native_theme/native_theme.h"

#include "ui/views/border.h"

#include "ui/views/controls/menu/menu_config.h"

#include "ui/views/controls/menu/menu_controller.h"

#include "ui/views/controls/menu/menu_item_view.h"

#include "ui/views/controls/menu/submenu_view.h"

-using gfx::NativeTheme;

+using ui::NativeTheme;

// Height of the scroll arrow.

// This goes up to 4 with large fonts, but this is close enough for now.