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

Side by Side Diff: chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc

Issue 2245143005: Move upgrade severity colors into NativeTheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
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 "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h" 5 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h" 9 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h"
10 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h" 10 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h"
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 case kColorId_ThrobberSpinningColor: 447 case kColorId_ThrobberSpinningColor:
448 case kColorId_ThrobberLightColor: 448 case kColorId_ThrobberLightColor:
449 return GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused); 449 return GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused);
450 450
451 case kColorId_ThrobberWaitingColor: 451 case kColorId_ThrobberWaitingColor:
452 return color_utils::AlphaBlend( 452 return color_utils::AlphaBlend(
453 GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused), 453 GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused),
454 GetBGColor(GetWindow(), NORMAL), 454 GetBGColor(GetWindow(), NORMAL),
455 0x80); 455 0x80);
456 456
457 // Alert icons
458 // These aren't yet used in any GTK NativeTheme context, so they don't have
459 // definitions.
460 case kColorId_AlertSeverityLow:
461 case kColorId_AlertSeverityMedium:
462 case kColorId_AlertSeverityHigh:
457 case kColorId_NumColors: 463 case kColorId_NumColors:
458 NOTREACHED(); 464 NOTREACHED();
459 break; 465 break;
460 } 466 }
461 467
462 return kInvalidColorIdColor; 468 return kInvalidColorIdColor;
463 } 469 }
464 470
465 // Get ChromeGtkFrame theme colors. No-op in GTK3. 471 // Get ChromeGtkFrame theme colors. No-op in GTK3.
466 bool NativeThemeGtk2::GetChromeStyleColor(const char* style_property, 472 bool NativeThemeGtk2::GetChromeStyleColor(const char* style_property,
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 574
569 if (!fake_menu_item) { 575 if (!fake_menu_item) {
570 fake_menu_item = gtk_custom_menu_item_new(); 576 fake_menu_item = gtk_custom_menu_item_new();
571 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item); 577 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item);
572 } 578 }
573 579
574 return fake_menu_item; 580 return fake_menu_item;
575 } 581 }
576 582
577 } // namespace libgtk2ui 583 } // namespace libgtk2ui
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar/app_menu_button.cc » ('j') | ui/native_theme/native_theme_dark_aura.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698