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

Side by Side Diff: chrome/browser/ui/libgtkui/native_theme_gtk3.cc

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 | « chrome/browser/ui/libgtkui/native_theme_gtk2.cc ('k') | ui/native_theme/common_theme.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "chrome/browser/ui/libgtkui/native_theme_gtk3.h" 5 #include "chrome/browser/ui/libgtkui/native_theme_gtk3.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h" 9 #include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h"
10 #include "chrome/browser/ui/libgtkui/chrome_gtk_menu_subclasses.h" 10 #include "chrome/browser/ui/libgtkui/chrome_gtk_menu_subclasses.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 case ui::NativeTheme::kColorId_TooltipText: 224 case ui::NativeTheme::kColorId_TooltipText:
225 return color_utils::GetReadableColor(GetFgColor("GtkTooltip#tooltip"), 225 return color_utils::GetReadableColor(GetFgColor("GtkTooltip#tooltip"),
226 GetBgColor("GtkTooltip#tooltip")); 226 GetBgColor("GtkTooltip#tooltip"));
227 227
228 // Trees and Tables (implemented on GTK using the same class) 228 // Trees and Tables (implemented on GTK using the same class)
229 case ui::NativeTheme::kColorId_TableBackground: 229 case ui::NativeTheme::kColorId_TableBackground:
230 case ui::NativeTheme::kColorId_TreeBackground: 230 case ui::NativeTheme::kColorId_TreeBackground:
231 return GetBgColor("GtkTreeView#treeview.view .view.cell"); 231 return GetBgColor("GtkTreeView#treeview.view .view.cell");
232 case ui::NativeTheme::kColorId_TableText: 232 case ui::NativeTheme::kColorId_TableText:
233 case ui::NativeTheme::kColorId_TreeText: 233 case ui::NativeTheme::kColorId_TreeText:
234 case ui::NativeTheme::kColorId_TreeArrow:
235 case ui::NativeTheme::kColorId_TableGroupingIndicatorColor: 234 case ui::NativeTheme::kColorId_TableGroupingIndicatorColor:
236 return GetFgColor("GtkTreeView#treeview.view .view.cell GtkLabel"); 235 return GetFgColor("GtkTreeView#treeview.view .view.cell GtkLabel");
237 case ui::NativeTheme::kColorId_TableSelectedText: 236 case ui::NativeTheme::kColorId_TableSelectedText:
238 case ui::NativeTheme::kColorId_TableSelectedTextUnfocused: 237 case ui::NativeTheme::kColorId_TableSelectedTextUnfocused:
239 case ui::NativeTheme::kColorId_TreeSelectedText: 238 case ui::NativeTheme::kColorId_TreeSelectedText:
240 case ui::NativeTheme::kColorId_TreeSelectedTextUnfocused: 239 case ui::NativeTheme::kColorId_TreeSelectedTextUnfocused:
241 return GetFgColor( 240 return GetFgColor(
242 "GtkTreeView#treeview.view .view.cell:selected:focus GtkLabel"); 241 "GtkTreeView#treeview.view .view.cell:selected:focus GtkLabel");
243 case ui::NativeTheme::kColorId_TableSelectionBackgroundFocused: 242 case ui::NativeTheme::kColorId_TableSelectionBackgroundFocused:
244 case ui::NativeTheme::kColorId_TableSelectionBackgroundUnfocused: 243 case ui::NativeTheme::kColorId_TableSelectionBackgroundUnfocused:
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 542
544 if (frame_top_area.incognito) { 543 if (frame_top_area.incognito) {
545 bitmap = SkBitmapOperations::CreateHSLShiftedBitmap( 544 bitmap = SkBitmapOperations::CreateHSLShiftedBitmap(
546 bitmap, kDefaultTintFrameIncognito); 545 bitmap, kDefaultTintFrameIncognito);
547 } 546 }
548 547
549 canvas->drawBitmap(bitmap, rect.x(), rect.y()); 548 canvas->drawBitmap(bitmap, rect.x(), rect.y());
550 } 549 }
551 550
552 } // namespace libgtkui 551 } // namespace libgtkui
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtkui/native_theme_gtk2.cc ('k') | ui/native_theme/common_theme.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698