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

Side by Side Diff: chrome/browser/themes/theme_service.cc

Issue 10662032: alternate ntp (cros/partial-win): add tab-related stuff and toolbar/tab background change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed scott's comments Created 8 years, 5 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/themes/theme_service.h ('k') | chrome/browser/ui/browser.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/themes/theme_service.h" 5 #include "chrome/browser/themes/theme_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ref_counted_memory.h" 8 #include "base/memory/ref_counted_memory.h"
9 #include "base/string_split.h" 9 #include "base/string_split.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 const SkColor kDefaultColorNTPBackground = SK_ColorWHITE; 117 const SkColor kDefaultColorNTPBackground = SK_ColorWHITE;
118 const SkColor kDefaultColorNTPText = SK_ColorBLACK; 118 const SkColor kDefaultColorNTPText = SK_ColorBLACK;
119 const SkColor kDefaultColorNTPLink = SkColorSetRGB(6, 55, 116); 119 const SkColor kDefaultColorNTPLink = SkColorSetRGB(6, 55, 116);
120 #endif 120 #endif
121 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(150, 150, 150); 121 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(150, 150, 150);
122 const SkColor kDefaultColorNTPSection = SkColorSetRGB(229, 229, 229); 122 const SkColor kDefaultColorNTPSection = SkColorSetRGB(229, 229, 229);
123 const SkColor kDefaultColorNTPSectionText = SK_ColorBLACK; 123 const SkColor kDefaultColorNTPSectionText = SK_ColorBLACK;
124 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(6, 55, 116); 124 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(6, 55, 116);
125 const SkColor kDefaultColorControlBackground = SkColorSetARGB(0, 0, 0, 0); 125 const SkColor kDefaultColorControlBackground = SkColorSetARGB(0, 0, 0, 0);
126 const SkColor kDefaultColorButtonBackground = SkColorSetARGB(0, 0, 0, 0); 126 const SkColor kDefaultColorButtonBackground = SkColorSetARGB(0, 0, 0, 0);
127 const SkColor kDefaultColorSearchNTPBackground = SkColorSetRGB(245, 245, 245);
128 const SkColor kDefaultColorSearchSearchBackground =
129 SkColorSetRGB(245, 245, 245);
130 const SkColor kDefaultColorSearchDefaultBackground =
131 SkColorSetRGB(245, 245, 245);
132 const SkColor kDefaultColorSearchSeparator = SkColorSetRGB(200, 200, 200);
127 #if defined(OS_MACOSX) 133 #if defined(OS_MACOSX)
128 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81); 134 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81);
129 const SkColor kDefaultColorToolbarButtonStrokeInactive = 135 const SkColor kDefaultColorToolbarButtonStrokeInactive =
130 SkColorSetARGB(75, 99, 99, 99); 136 SkColorSetARGB(75, 99, 99, 99);
131 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(247, 247, 247); 137 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(247, 247, 247);
132 const SkColor kDefaultColorToolbarStroke = SkColorSetRGB(103, 103, 103); 138 const SkColor kDefaultColorToolbarStroke = SkColorSetRGB(103, 103, 103);
133 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(123, 123, 123); 139 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(123, 123, 123);
134 #endif 140 #endif
135 141
136 // Default tints. 142 // Default tints.
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 case COLOR_NTP_SECTION_TEXT: 533 case COLOR_NTP_SECTION_TEXT:
528 return kDefaultColorNTPSectionText; 534 return kDefaultColorNTPSectionText;
529 case COLOR_NTP_SECTION_LINK: 535 case COLOR_NTP_SECTION_LINK:
530 return kDefaultColorNTPSectionLink; 536 return kDefaultColorNTPSectionLink;
531 case COLOR_NTP_SECTION_LINK_UNDERLINE: 537 case COLOR_NTP_SECTION_LINK_UNDERLINE:
532 return TintForUnderline(kDefaultColorNTPSectionLink); 538 return TintForUnderline(kDefaultColorNTPSectionLink);
533 case COLOR_CONTROL_BACKGROUND: 539 case COLOR_CONTROL_BACKGROUND:
534 return kDefaultColorControlBackground; 540 return kDefaultColorControlBackground;
535 case COLOR_BUTTON_BACKGROUND: 541 case COLOR_BUTTON_BACKGROUND:
536 return kDefaultColorButtonBackground; 542 return kDefaultColorButtonBackground;
543 case COLOR_SEARCH_NTP_BACKGROUND:
544 return kDefaultColorSearchNTPBackground;
545 case COLOR_SEARCH_SEARCH_BACKGROUND:
546 return kDefaultColorSearchSearchBackground;
547 case COLOR_SEARCH_DEFAULT_BACKGROUND:
548 return kDefaultColorSearchDefaultBackground;
549 case COLOR_SEARCH_SEPARATOR_LINE:
550 return kDefaultColorSearchSeparator;
537 #if defined(OS_MACOSX) 551 #if defined(OS_MACOSX)
538 case COLOR_TOOLBAR_BUTTON_STROKE: 552 case COLOR_TOOLBAR_BUTTON_STROKE:
539 return kDefaultColorToolbarButtonStroke; 553 return kDefaultColorToolbarButtonStroke;
540 case COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE: 554 case COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE:
541 return kDefaultColorToolbarButtonStrokeInactive; 555 return kDefaultColorToolbarButtonStrokeInactive;
542 case COLOR_TOOLBAR_BEZEL: 556 case COLOR_TOOLBAR_BEZEL:
543 return kDefaultColorToolbarBezel; 557 return kDefaultColorToolbarBezel;
544 case COLOR_TOOLBAR_STROKE: 558 case COLOR_TOOLBAR_STROKE:
545 return kDefaultColorToolbarStroke; 559 return kDefaultColorToolbarStroke;
546 case COLOR_TOOLBAR_STROKE_INACTIVE: 560 case COLOR_TOOLBAR_STROKE_INACTIVE:
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 void ThemeService::OnInfobarDisplayed() { 713 void ThemeService::OnInfobarDisplayed() {
700 number_of_infobars_++; 714 number_of_infobars_++;
701 } 715 }
702 716
703 void ThemeService::OnInfobarDestroyed() { 717 void ThemeService::OnInfobarDestroyed() {
704 number_of_infobars_--; 718 number_of_infobars_--;
705 719
706 if (number_of_infobars_ == 0) 720 if (number_of_infobars_ == 0)
707 RemoveUnusedThemes(); 721 RemoveUnusedThemes();
708 } 722 }
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698