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

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

Issue 1454983003: Remove unused color from NativeTheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_result_view.h » ('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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 GetSystemColor(kColorId_TextfieldDefaultBackground), 405 GetSystemColor(kColorId_TextfieldDefaultBackground),
406 0x80); 406 0x80);
407 case kColorId_ResultsTableNormalUrl: 407 case kColorId_ResultsTableNormalUrl:
408 case kColorId_ResultsTableHoveredUrl: 408 case kColorId_ResultsTableHoveredUrl:
409 return NormalURLColor(GetSystemColor(kColorId_TextfieldDefaultColor)); 409 return NormalURLColor(GetSystemColor(kColorId_TextfieldDefaultColor));
410 410
411 case kColorId_ResultsTableSelectedUrl: 411 case kColorId_ResultsTableSelectedUrl:
412 return SelectedURLColor( 412 return SelectedURLColor(
413 GetSystemColor(kColorId_TextfieldSelectionColor), 413 GetSystemColor(kColorId_TextfieldSelectionColor),
414 GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused)); 414 GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused));
415 case kColorId_ResultsTableNormalDivider:
416 return color_utils::AlphaBlend(GetTextColor(GetWindow(), NORMAL),
417 GetBGColor(GetWindow(), NORMAL),
418 0x34);
419 case kColorId_ResultsTableHoveredDivider:
420 return color_utils::AlphaBlend(GetTextColor(GetWindow(), PRELIGHT),
421 GetBGColor(GetWindow(), PRELIGHT),
422 0x34);
423 case kColorId_ResultsTableSelectedDivider:
424 return color_utils::AlphaBlend(GetTextColor(GetWindow(), SELECTED),
425 GetBGColor(GetWindow(), SELECTED),
426 0x34);
427 415
428 case kColorId_ResultsTablePositiveText: { 416 case kColorId_ResultsTablePositiveText: {
429 return color_utils::GetReadableColor(kPositiveTextColor, 417 return color_utils::GetReadableColor(kPositiveTextColor,
430 GetBaseColor(GetEntry(), NORMAL)); 418 GetBaseColor(GetEntry(), NORMAL));
431 } 419 }
432 case kColorId_ResultsTablePositiveHoveredText: { 420 case kColorId_ResultsTablePositiveHoveredText: {
433 return color_utils::GetReadableColor(kPositiveTextColor, 421 return color_utils::GetReadableColor(kPositiveTextColor,
434 GetBaseColor(GetEntry(), PRELIGHT)); 422 GetBaseColor(GetEntry(), PRELIGHT));
435 } 423 }
436 case kColorId_ResultsTablePositiveSelectedText: { 424 case kColorId_ResultsTablePositiveSelectedText: {
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 563
576 if (!fake_menu_item) { 564 if (!fake_menu_item) {
577 fake_menu_item = gtk_custom_menu_item_new(); 565 fake_menu_item = gtk_custom_menu_item_new();
578 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item); 566 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item);
579 } 567 }
580 568
581 return fake_menu_item; 569 return fake_menu_item;
582 } 570 }
583 571
584 } // namespace libgtk2ui 572 } // namespace libgtk2ui
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_result_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698