Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 85 #endif // USE_AURA | 85 #endif // USE_AURA |
| 86 const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(83, 106, 139); | 86 const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(83, 106, 139); |
| 87 const SkColor kDefaultColorFrameIncognitoInactive = | 87 const SkColor kDefaultColorFrameIncognitoInactive = |
| 88 SkColorSetRGB(126, 139, 156); | 88 SkColorSetRGB(126, 139, 156); |
| 89 #if defined(OS_MACOSX) | 89 #if defined(OS_MACOSX) |
| 90 const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230); | 90 const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230); |
| 91 #else | 91 #else |
| 92 const SkColor kDefaultColorToolbar = SkColorSetRGB(223, 223, 223); | 92 const SkColor kDefaultColorToolbar = SkColorSetRGB(223, 223, 223); |
| 93 #endif | 93 #endif |
| 94 #if defined(USE_AURA) | 94 #if defined(USE_AURA) |
| 95 const SkColor kDefaultColorToolbarSeparator = SkColorSetRGB(128, 128, 128); | 95 const SkColor kDefaultColorToolbarSeparator = SkColorSetRGB(170, 170, 171); |
| 96 #else | 96 #else |
| 97 const SkColor kDefaultColorToolbarSeparator = SkColorSetRGB(182, 186, 192); | 97 const SkColor kDefaultColorToolbarSeparator = SkColorSetRGB(182, 186, 192); |
|
flackr
2012/09/24 23:11:13
Just waiting on Sebastien to see if we want to cha
| |
| 98 #endif | 98 #endif |
| 99 const SkColor kDefaultColorTabText = SK_ColorBLACK; | 99 const SkColor kDefaultColorTabText = SK_ColorBLACK; |
| 100 #if defined(OS_MACOSX) | 100 #if defined(OS_MACOSX) |
| 101 const SkColor kDefaultColorBackgroundTabText = SK_ColorBLACK; | 101 const SkColor kDefaultColorBackgroundTabText = SK_ColorBLACK; |
| 102 #else | 102 #else |
| 103 const SkColor kDefaultColorBackgroundTabText = SkColorSetRGB(64, 64, 64); | 103 const SkColor kDefaultColorBackgroundTabText = SkColorSetRGB(64, 64, 64); |
| 104 #endif | 104 #endif |
| 105 const SkColor kDefaultColorBookmarkText = SK_ColorBLACK; | 105 const SkColor kDefaultColorBookmarkText = SK_ColorBLACK; |
| 106 #if defined(OS_WIN) | 106 #if defined(OS_WIN) |
| 107 const SkColor kDefaultColorNTPBackground = | 107 const SkColor kDefaultColorNTPBackground = |
| (...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 713 void ThemeService::OnInfobarDisplayed() { | 713 void ThemeService::OnInfobarDisplayed() { |
| 714 number_of_infobars_++; | 714 number_of_infobars_++; |
| 715 } | 715 } |
| 716 | 716 |
| 717 void ThemeService::OnInfobarDestroyed() { | 717 void ThemeService::OnInfobarDestroyed() { |
| 718 number_of_infobars_--; | 718 number_of_infobars_--; |
| 719 | 719 |
| 720 if (number_of_infobars_ == 0) | 720 if (number_of_infobars_ == 0) |
| 721 RemoveUnusedThemes(); | 721 RemoveUnusedThemes(); |
| 722 } | 722 } |
| OLD | NEW |