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

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

Issue 2694323003: Reuse submenu arrow images for trees (like the edit bookmark tree). (Closed)
Patch Set: remove TreeArrow color Created 3 years, 10 months 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_dark_aura.cc ('k') | ui/native_theme/native_theme_win.cc » ('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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 case kColorId_TreeSelectedText: 235 case kColorId_TreeSelectedText:
236 case kColorId_TableSelectedText: 236 case kColorId_TableSelectedText:
237 return NSSystemColorToSkColor( 237 return NSSystemColorToSkColor(
238 [NSColor alternateSelectedControlTextColor]); 238 [NSColor alternateSelectedControlTextColor]);
239 case kColorId_TreeSelectionBackgroundFocused: 239 case kColorId_TreeSelectionBackgroundFocused:
240 case kColorId_TableSelectionBackgroundFocused: 240 case kColorId_TableSelectionBackgroundFocused:
241 return NSSystemColorToSkColor([NSColor alternateSelectedControlColor]); 241 return NSSystemColorToSkColor([NSColor alternateSelectedControlColor]);
242 case kColorId_TreeSelectionBackgroundUnfocused: 242 case kColorId_TreeSelectionBackgroundUnfocused:
243 case kColorId_TableSelectionBackgroundUnfocused: 243 case kColorId_TableSelectionBackgroundUnfocused:
244 return kUnfocusedSelectedTextBackgroundColor; 244 return kUnfocusedSelectedTextBackgroundColor;
245 case kColorId_TreeArrow:
246 case kColorId_TableGroupingIndicatorColor: 245 case kColorId_TableGroupingIndicatorColor:
247 return SkColorSetRGB(140, 140, 140); 246 return SkColorSetRGB(140, 140, 140);
248 247
249 default: 248 default:
250 // TODO(tapted): Handle all values and remove the default case. 249 // TODO(tapted): Handle all values and remove the default case.
251 return GetAuraColor(color_id, this); 250 return GetAuraColor(color_id, this);
252 } 251 }
253 } 252 }
254 253
255 void NativeThemeMac::PaintMenuPopupBackground( 254 void NativeThemeMac::PaintMenuPopupBackground(
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 canvas->drawDRRect(outer_shape, shape, flags); 436 canvas->drawDRRect(outer_shape, shape, flags);
438 } 437 }
439 438
440 NativeThemeMac::NativeThemeMac() { 439 NativeThemeMac::NativeThemeMac() {
441 } 440 }
442 441
443 NativeThemeMac::~NativeThemeMac() { 442 NativeThemeMac::~NativeThemeMac() {
444 } 443 }
445 444
446 } // namespace ui 445 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_dark_aura.cc ('k') | ui/native_theme/native_theme_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698