ui/views/widget/native_widget_mac.mm - 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/native_widget_mac.mm

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/native_widget_mac.mm

diff --git a/ui/views/widget/native_widget_mac.mm b/ui/views/widget/native_widget_mac.mm

index 1b5b2eb12bc14eaadd885b7c75d71d0eca11636b..a9af6fe6d67fb2e632b905e14619ccc86540617f 100644

--- a/ui/views/widget/native_widget_mac.mm

+++ b/ui/views/widget/native_widget_mac.mm

@@ -15,6 +15,7 @@

#import "ui/gfx/mac/coordinate_conversion.h"

#import "ui/gfx/mac/nswindow_frame_controls.h"

#include "ui/native_theme/native_theme.h"

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

#import "ui/views/cocoa/bridged_content_view.h"

#import "ui/views/cocoa/bridged_native_widget.h"

#import "ui/views/cocoa/native_widget_mac_nswindow.h"

@@ -551,7 +552,7 @@ void NativeWidgetMac::SetVisibilityAnimationTransition(

}

ui::NativeTheme* NativeWidgetMac::GetNativeTheme() const {

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

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

}

void NativeWidgetMac::OnRootViewLayout() {

« ui/native_theme/native_theme.h ('K') | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ('k') | no next file » | no next file with comments »