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

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

Issue 3250002: Add an accordian effect to NTP. (Closed)
Patch Set: Fix menu positioning when there is a scrollbar. Created 10 years, 3 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) 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/themes/browser_theme_provider.h" 5 #include "chrome/browser/themes/browser_theme_provider.h"
6 6
7 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/extensions/extensions_service.h" 10 #include "chrome/browser/extensions/extensions_service.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // TODO(beng): source from theme provider. 73 // TODO(beng): source from theme provider.
74 const SkColor kDefaultColorNTPBackground = SK_ColorWHITE; 74 const SkColor kDefaultColorNTPBackground = SK_ColorWHITE;
75 const SkColor kDefaultColorNTPText = SK_ColorBLACK; 75 const SkColor kDefaultColorNTPText = SK_ColorBLACK;
76 const SkColor kDefaultColorNTPLink = SkColorSetRGB(6, 55, 116); 76 const SkColor kDefaultColorNTPLink = SkColorSetRGB(6, 55, 116);
77 #endif 77 #endif
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 kDefaultColorNTPSectionHeaderText = SkColorSetRGB(76, 76, 76); 82 const SkColor kDefaultColorNTPSectionHeaderText = SkColorSetRGB(76, 76, 76);
83 const SkColor kDefaultColorNTPSectionHeaderRule = SkColorSetRGB(179, 179, 179);
84 const SkColor kDefaultColorNTPSectionHeaderRuleLight =
85 SkColorSetRGB(220, 220, 220);
83 const SkColor kDefaultColorControlBackground = SkColorSetARGB(0, 0, 0, 0); 86 const SkColor kDefaultColorControlBackground = SkColorSetARGB(0, 0, 0, 0);
84 const SkColor kDefaultColorButtonBackground = SkColorSetARGB(0, 0, 0, 0); 87 const SkColor kDefaultColorButtonBackground = SkColorSetARGB(0, 0, 0, 0);
85 #if defined(OS_MACOSX) 88 #if defined(OS_MACOSX)
86 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81); 89 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81);
87 const SkColor kDefaultColorToolbarButtonStrokeInactive = 90 const SkColor kDefaultColorToolbarButtonStrokeInactive =
88 SkColorSetARGB(75, 99, 99, 99); 91 SkColorSetARGB(75, 99, 99, 99);
89 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(247, 247, 247); 92 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(247, 247, 247);
90 const SkColor kDefaultColorToolbarStroke = SkColorSetRGB(103, 103, 103); 93 const SkColor kDefaultColorToolbarStroke = SkColorSetRGB(103, 103, 103);
91 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(123, 123, 123); 94 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(123, 123, 123);
92 #endif 95 #endif
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 case COLOR_NTP_SECTION_TEXT: 445 case COLOR_NTP_SECTION_TEXT:
443 return kDefaultColorNTPSectionText; 446 return kDefaultColorNTPSectionText;
444 case COLOR_NTP_SECTION_LINK: 447 case COLOR_NTP_SECTION_LINK:
445 return kDefaultColorNTPSectionLink; 448 return kDefaultColorNTPSectionLink;
446 case COLOR_NTP_SECTION_LINK_UNDERLINE: 449 case COLOR_NTP_SECTION_LINK_UNDERLINE:
447 return TintForUnderline(kDefaultColorNTPSectionLink); 450 return TintForUnderline(kDefaultColorNTPSectionLink);
448 case COLOR_NTP_SECTION_HEADER_TEXT: 451 case COLOR_NTP_SECTION_HEADER_TEXT:
449 return kDefaultColorNTPSectionHeaderText; 452 return kDefaultColorNTPSectionHeaderText;
450 case COLOR_NTP_SECTION_HEADER_TEXT_HOVER: 453 case COLOR_NTP_SECTION_HEADER_TEXT_HOVER:
451 return kDefaultColorNTPText; 454 return kDefaultColorNTPText;
455 case COLOR_NTP_SECTION_HEADER_RULE:
456 return kDefaultColorNTPSectionHeaderRule;
457 case COLOR_NTP_SECTION_HEADER_RULE_LIGHT:
458 return kDefaultColorNTPSectionHeaderRuleLight;
452 case COLOR_CONTROL_BACKGROUND: 459 case COLOR_CONTROL_BACKGROUND:
453 return kDefaultColorControlBackground; 460 return kDefaultColorControlBackground;
454 case COLOR_BUTTON_BACKGROUND: 461 case COLOR_BUTTON_BACKGROUND:
455 return kDefaultColorButtonBackground; 462 return kDefaultColorButtonBackground;
456 #if defined(OS_MACOSX) 463 #if defined(OS_MACOSX)
457 case COLOR_TOOLBAR_BUTTON_STROKE: 464 case COLOR_TOOLBAR_BUTTON_STROKE:
458 return kDefaultColorToolbarButtonStroke; 465 return kDefaultColorToolbarButtonStroke;
459 case COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE: 466 case COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE:
460 return kDefaultColorToolbarButtonStrokeInactive; 467 return kDefaultColorToolbarButtonStrokeInactive;
461 case COLOR_TOOLBAR_BEZEL: 468 case COLOR_TOOLBAR_BEZEL:
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 void BrowserThemeProvider::OnInfobarDisplayed() { 612 void BrowserThemeProvider::OnInfobarDisplayed() {
606 number_of_infobars_++; 613 number_of_infobars_++;
607 } 614 }
608 615
609 void BrowserThemeProvider::OnInfobarDestroyed() { 616 void BrowserThemeProvider::OnInfobarDestroyed() {
610 number_of_infobars_--; 617 number_of_infobars_--;
611 618
612 if (number_of_infobars_ == 0) 619 if (number_of_infobars_ == 0)
613 RemoveUnusedThemes(); 620 RemoveUnusedThemes();
614 } 621 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698