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

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

Issue 2484043003: Revert of Clean up some NativeTheme code. (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
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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
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
116 NativeTheme* NativeTheme::GetInstanceForNativeUi() {
117 return NativeThemeMac::instance();
118 }
119
120 // static 115 // static
121 NativeThemeMac* NativeThemeMac::instance() { 116 NativeThemeMac* NativeThemeMac::instance() {
122 CR_DEFINE_STATIC_LOCAL(NativeThemeMac, s_native_theme, ()); 117 CR_DEFINE_STATIC_LOCAL(NativeThemeMac, s_native_theme, ());
123 return &s_native_theme; 118 return &s_native_theme;
124 } 119 }
125 120
126 // static 121 // static
127 SkColor NativeThemeMac::ApplySystemControlTint(SkColor color) { 122 SkColor NativeThemeMac::ApplySystemControlTint(SkColor color) {
128 if ([NSColor currentControlTint] == NSGraphiteControlTint) 123 if ([NSColor currentControlTint] == NSGraphiteControlTint)
129 return ColorToGrayscale(color); 124 return ColorToGrayscale(color);
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 canvas->drawDRRect(outer_shape, shape, paint); 426 canvas->drawDRRect(outer_shape, shape, paint);
432 } 427 }
433 428
434 NativeThemeMac::NativeThemeMac() { 429 NativeThemeMac::NativeThemeMac() {
435 } 430 }
436 431
437 NativeThemeMac::~NativeThemeMac() { 432 NativeThemeMac::~NativeThemeMac() {
438 } 433 }
439 434
440 } // namespace ui 435 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698