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

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

Issue 2076893002: Theme code cleanup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « no previous file | 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 (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 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 0x80); 393 0x80);
394 case kColorId_ResultsTableSelectedBackground: 394 case kColorId_ResultsTableSelectedBackground:
395 return GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused); 395 return GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused);
396 case kColorId_ResultsTableNormalText: 396 case kColorId_ResultsTableNormalText:
397 case kColorId_ResultsTableHoveredText: 397 case kColorId_ResultsTableHoveredText:
398 return GetSystemColor(kColorId_TextfieldDefaultColor); 398 return GetSystemColor(kColorId_TextfieldDefaultColor);
399 case kColorId_ResultsTableSelectedText: 399 case kColorId_ResultsTableSelectedText:
400 return GetSystemColor(kColorId_TextfieldSelectionColor); 400 return GetSystemColor(kColorId_TextfieldSelectionColor);
401 case kColorId_ResultsTableNormalDimmedText: 401 case kColorId_ResultsTableNormalDimmedText:
402 case kColorId_ResultsTableHoveredDimmedText: 402 case kColorId_ResultsTableHoveredDimmedText:
403 case kColorId_ResultsTableNormalHeadline:
404 case kColorId_ResultsTableHoveredHeadline:
405 return color_utils::AlphaBlend( 403 return color_utils::AlphaBlend(
406 GetSystemColor(kColorId_TextfieldDefaultColor), 404 GetSystemColor(kColorId_TextfieldDefaultColor),
407 GetSystemColor(kColorId_TextfieldDefaultBackground), 405 GetSystemColor(kColorId_TextfieldDefaultBackground),
408 0x80); 406 0x80);
409 case kColorId_ResultsTableSelectedDimmedText: 407 case kColorId_ResultsTableSelectedDimmedText:
410 case kColorId_ResultsTableSelectedHeadline:
411 return color_utils::AlphaBlend( 408 return color_utils::AlphaBlend(
412 GetSystemColor(kColorId_TextfieldSelectionColor), 409 GetSystemColor(kColorId_TextfieldSelectionColor),
413 GetSystemColor(kColorId_TextfieldDefaultBackground), 410 GetSystemColor(kColorId_TextfieldDefaultBackground),
414 0x80); 411 0x80);
415 case kColorId_ResultsTableNormalUrl: 412 case kColorId_ResultsTableNormalUrl:
416 case kColorId_ResultsTableHoveredUrl: 413 case kColorId_ResultsTableHoveredUrl:
417 return NormalURLColor(GetSystemColor(kColorId_TextfieldDefaultColor)); 414 return NormalURLColor(GetSystemColor(kColorId_TextfieldDefaultColor));
418 415
419 case kColorId_ResultsTableSelectedUrl: 416 case kColorId_ResultsTableSelectedUrl:
420 return SelectedURLColor( 417 return SelectedURLColor(
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 568
572 if (!fake_menu_item) { 569 if (!fake_menu_item) {
573 fake_menu_item = gtk_custom_menu_item_new(); 570 fake_menu_item = gtk_custom_menu_item_new();
574 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item); 571 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item);
575 } 572 }
576 573
577 return fake_menu_item; 574 return fake_menu_item;
578 } 575 }
579 576
580 } // namespace libgtk2ui 577 } // namespace libgtk2ui
OLDNEW
« no previous file with comments | « no previous file | ui/native_theme/common_theme.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698