ui/views/widget/desktop_aura/desktop_window_tree_host_x11.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/widget/desktop_aura/desktop_window_tree_host_x11.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: rebase 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/widget/desktop_aura/desktop_window_tree_host_x11.cc

diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

index d02dede8a7569828789be42e5724717dd6c3940d..81b250bd834557800989ebb08c33d2b51d916fa8 100644

--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

@@ -40,6 +40,7 @@

#include "ui/gfx/path_x11.h"

#include "ui/gfx/screen.h"

#include "ui/native_theme/native_theme.h"

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

#include "ui/views/corewm/tooltip_aura.h"

#include "ui/views/linux_ui/linux_ui.h"

#include "ui/views/views_delegate.h"

@@ -2069,7 +2070,7 @@ ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) {

return native_theme;

}

- return ui::NativeTheme::instance();

+ return ui::NativeThemeAura::instance();

}

} // namespace views

« ui/native_theme/native_theme.h ('K') | « ui/views/views.gyp ('k') | ui/views/widget/native_widget_mac.mm » ('j') | no next file with comments »