chrome/browser/ui/cocoa/browser/zoom_bubble_controller.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: chrome/browser/ui/cocoa/browser/zoom_bubble_controller.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: 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

« no previous file with comments | « chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.mm ('k') | chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

index 3d8fdfa84adf79440d465d6dbed459413cc84e3e..50d2a37e4964363c1504caff56fbe16f5b790589 100644

--- a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

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

#import "ui/base/cocoa/window_size_constants.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/native_theme/native_theme.h"

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

@interface ZoomBubbleController (Private)

- (void)performLayout;

@@ -90,7 +91,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

[window setInfoBubbleCanBecomeKeyWindow:NO];

delegate_ = delegate;

- ui::NativeTheme* nativeTheme = ui::NativeTheme::instance();

+ ui::NativeTheme* nativeTheme = ui::NativeThemeMac::instance();

[[self bubble] setAlignment:info_bubble::kAlignRightEdgeToAnchorEdge];

[[self bubble] setArrowLocation:info_bubble::kNoArrow];

[[self bubble] setBackgroundColor:

@@ -230,7 +231,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

base::scoped_nsobject<NSBox> separatorView(

[[NSBox alloc] initWithFrame:rect]);

[separatorView setBoxType:NSBoxCustom];

- ui::NativeTheme* nativeTheme = ui::NativeTheme::instance();

+ ui::NativeTheme* nativeTheme = ui::NativeThemeMac::instance();

[separatorView setBorderColor:

gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

ui::NativeTheme::kColorId_MenuSeparatorColor))];

@@ -334,7 +335,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

NSRect bounds = [self bounds];

NSAttributedString* title = [self attributedTitle];

if ([self hoverState] != kHoverStateNone) {

- ui::NativeTheme* nativeTheme = ui::NativeTheme::instance();

+ ui::NativeTheme* nativeTheme = ui::NativeThemeMac::instance();

[gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor)) set];

NSRectFillUsingOperation(bounds, NSCompositeSourceOver);