ui/views/controls/combobox/combobox.cc - Issue 1461923002: Change name of NativeTheme::instance() to make it clear it's web only.

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/combobox/combobox.cc

Issue 1461923002: Change name of NativeTheme::instance() to make it clear it's web only. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: NATIVE_THEME_EXPORT for mac Created 5 years, 1 month 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/combobox/combobox.cc

diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc

index edbc756bbb3684af9e6bdddbf859f7123f9a4c04..51b17e53f25fd4c50e3372e799913ca9c88d8f3b 100644

--- a/ui/views/controls/combobox/combobox.cc

+++ b/ui/views/controls/combobox/combobox.cc

@@ -18,6 +18,7 @@

#include "ui/gfx/text_utils.h"

#include "ui/native_theme/common_theme.h"

#include "ui/native_theme/native_theme.h"

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

#include "ui/resources/grit/ui_resources.h"

#include "ui/views/controls/button/custom_button.h"

#include "ui/views/controls/button/label_button.h"

@@ -890,9 +891,9 @@ gfx::Size Combobox::ArrowSize() const {

// TODO(estade): hack alert! This should always use GetNativeTheme(). For now

// STYLE_ACTION isn't properly themed so we have to override the NativeTheme

// behavior. See crbug.com/384071

- const ui::NativeTheme* native_theme_for_arrow = style_ == STYLE_ACTION ?

- ui::NativeTheme::instance() :

- GetNativeTheme();

+ const ui::NativeTheme* native_theme_for_arrow =

+ style_ == STYLE_ACTION ? ui::NativeThemeAura::instance()

+ : GetNativeTheme();

#else

const ui::NativeTheme* native_theme_for_arrow = GetNativeTheme();

#endif

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