Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: ui/native_theme/native_theme_mac.mm

Issue 2483683002: Try to get rid of all direct references to particular native themes. (Closed)
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « ui/native_theme/native_theme_mac.h ('k') | ui/native_theme/native_theme_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/native_theme/native_theme_mac.h" 5 #include "ui/native_theme/native_theme_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 } // namespace 106 } // namespace
107 107
108 namespace ui { 108 namespace ui {
109 109
110 // static 110 // static
111 NativeTheme* NativeTheme::GetInstanceForWeb() { 111 NativeTheme* NativeTheme::GetInstanceForWeb() {
112 return NativeThemeMac::instance(); 112 return NativeThemeMac::instance();
113 } 113 }
114 114
115 // static 115 // static
116 NativeTheme* NativeTheme::GetInstanceForNativeUi() {
117 return NativeThemeMac::instance();
118 }
119
120 // static
116 NativeThemeMac* NativeThemeMac::instance() { 121 NativeThemeMac* NativeThemeMac::instance() {
117 CR_DEFINE_STATIC_LOCAL(NativeThemeMac, s_native_theme, ()); 122 CR_DEFINE_STATIC_LOCAL(NativeThemeMac, s_native_theme, ());
118 return &s_native_theme; 123 return &s_native_theme;
119 } 124 }
120 125
121 // static 126 // static
122 SkColor NativeThemeMac::ApplySystemControlTint(SkColor color) { 127 SkColor NativeThemeMac::ApplySystemControlTint(SkColor color) {
123 if ([NSColor currentControlTint] == NSGraphiteControlTint) 128 if ([NSColor currentControlTint] == NSGraphiteControlTint)
124 return ColorToGrayscale(color); 129 return ColorToGrayscale(color);
125 return color; 130 return color;
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 canvas->drawDRRect(outer_shape, shape, paint); 431 canvas->drawDRRect(outer_shape, shape, paint);
427 } 432 }
428 433
429 NativeThemeMac::NativeThemeMac() { 434 NativeThemeMac::NativeThemeMac() {
430 } 435 }
431 436
432 NativeThemeMac::~NativeThemeMac() { 437 NativeThemeMac::~NativeThemeMac() {
433 } 438 }
434 439
435 } // namespace ui 440 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_mac.h ('k') | ui/native_theme/native_theme_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698