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

Side by Side Diff: chrome/browser/browser_theme_provider.cc

Issue 3140009: [Mac] Fix aesthetic issues with themes given the new TopChrome changes.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_theme_provider.h ('k') | chrome/browser/cocoa/gradient_button_cell.mm » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser_theme_provider.h" 5 #include "chrome/browser/browser_theme_provider.h"
6 6
7 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "chrome/browser/browser_theme_pack.h" 10 #include "chrome/browser/browser_theme_pack.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(75, 140, 220); 78 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(75, 140, 220);
79 const SkColor kDefaultColorNTPSection = SkColorSetRGB(229, 239, 254); 79 const SkColor kDefaultColorNTPSection = SkColorSetRGB(229, 239, 254);
80 const SkColor kDefaultColorNTPSectionText = SK_ColorBLACK; 80 const SkColor kDefaultColorNTPSectionText = SK_ColorBLACK;
81 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(6, 55, 116); 81 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(6, 55, 116);
82 const SkColor kDefaultColorControlBackground = SkColorSetARGB(0, 0, 0, 0); 82 const SkColor kDefaultColorControlBackground = SkColorSetARGB(0, 0, 0, 0);
83 const SkColor kDefaultColorButtonBackground = SkColorSetARGB(0, 0, 0, 0); 83 const SkColor kDefaultColorButtonBackground = SkColorSetARGB(0, 0, 0, 0);
84 #if defined(OS_MACOSX) 84 #if defined(OS_MACOSX)
85 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81); 85 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81);
86 const SkColor kDefaultColorToolbarButtonStrokeInactive = 86 const SkColor kDefaultColorToolbarButtonStrokeInactive =
87 SkColorSetARGB(75, 99, 99, 99); 87 SkColorSetARGB(75, 99, 99, 99);
88 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(247, 247, 247);
88 const SkColor kDefaultColorToolbarStroke = SkColorSetRGB(103, 103, 103); 89 const SkColor kDefaultColorToolbarStroke = SkColorSetRGB(103, 103, 103);
89 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(123, 123, 123); 90 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(123, 123, 123);
90 #endif 91 #endif
91 92
92 // Default tints. 93 // Default tints.
93 const color_utils::HSL kDefaultTintButtons = { -1, -1, -1 }; 94 const color_utils::HSL kDefaultTintButtons = { -1, -1, -1 };
94 const color_utils::HSL kDefaultTintFrame = { -1, -1, -1 }; 95 const color_utils::HSL kDefaultTintFrame = { -1, -1, -1 };
95 const color_utils::HSL kDefaultTintFrameInactive = { -1, -1, 0.75f }; 96 const color_utils::HSL kDefaultTintFrameInactive = { -1, -1, 0.75f };
96 const color_utils::HSL kDefaultTintFrameIncognito = { -1, 0.2f, 0.35f }; 97 const color_utils::HSL kDefaultTintFrameIncognito = { -1, 0.2f, 0.35f };
97 const color_utils::HSL kDefaultTintFrameIncognitoInactive = { -1, 0.3f, 0.6f }; 98 const color_utils::HSL kDefaultTintFrameIncognitoInactive = { -1, 0.3f, 0.6f };
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 return TintForUnderline(kDefaultColorNTPSectionLink); 446 return TintForUnderline(kDefaultColorNTPSectionLink);
446 case COLOR_CONTROL_BACKGROUND: 447 case COLOR_CONTROL_BACKGROUND:
447 return kDefaultColorControlBackground; 448 return kDefaultColorControlBackground;
448 case COLOR_BUTTON_BACKGROUND: 449 case COLOR_BUTTON_BACKGROUND:
449 return kDefaultColorButtonBackground; 450 return kDefaultColorButtonBackground;
450 #if defined(OS_MACOSX) 451 #if defined(OS_MACOSX)
451 case COLOR_TOOLBAR_BUTTON_STROKE: 452 case COLOR_TOOLBAR_BUTTON_STROKE:
452 return kDefaultColorToolbarButtonStroke; 453 return kDefaultColorToolbarButtonStroke;
453 case COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE: 454 case COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE:
454 return kDefaultColorToolbarButtonStrokeInactive; 455 return kDefaultColorToolbarButtonStrokeInactive;
456 case COLOR_TOOLBAR_BEZEL:
457 return kDefaultColorToolbarBezel;
455 case COLOR_TOOLBAR_STROKE: 458 case COLOR_TOOLBAR_STROKE:
456 return kDefaultColorToolbarStroke; 459 return kDefaultColorToolbarStroke;
457 case COLOR_TOOLBAR_STROKE_INACTIVE: 460 case COLOR_TOOLBAR_STROKE_INACTIVE:
458 return kDefaultColorToolbarStrokeInactive; 461 return kDefaultColorToolbarStrokeInactive;
459 #endif 462 #endif
460 default: 463 default:
461 // Return a debugging red color. 464 // Return a debugging red color.
462 return 0xffff0000; 465 return 0xffff0000;
463 } 466 }
464 } 467 }
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 void BrowserThemeProvider::OnInfobarDisplayed() { 600 void BrowserThemeProvider::OnInfobarDisplayed() {
598 number_of_infobars_++; 601 number_of_infobars_++;
599 } 602 }
600 603
601 void BrowserThemeProvider::OnInfobarDestroyed() { 604 void BrowserThemeProvider::OnInfobarDestroyed() {
602 number_of_infobars_--; 605 number_of_infobars_--;
603 606
604 if (number_of_infobars_ == 0) 607 if (number_of_infobars_ == 0)
605 RemoveUnusedThemes(); 608 RemoveUnusedThemes();
606 } 609 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_theme_provider.h ('k') | chrome/browser/cocoa/gradient_button_cell.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698