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

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

Issue 10965042: Use new find in page resource on Windows too. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use same separator color on windows. Created 8 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 | Annotate | Revision Log
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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228); 84 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
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 const SkColor kDefaultColorToolbarSeparator = SkColorSetRGB(170, 170, 171);
95 const SkColor kDefaultColorToolbarSeparator = SkColorSetRGB(128, 128, 128);
96 #else
97 const SkColor kDefaultColorToolbarSeparator = SkColorSetRGB(182, 186, 192);
98 #endif
99 const SkColor kDefaultColorTabText = SK_ColorBLACK; 95 const SkColor kDefaultColorTabText = SK_ColorBLACK;
100 #if defined(OS_MACOSX) 96 #if defined(OS_MACOSX)
101 const SkColor kDefaultColorBackgroundTabText = SK_ColorBLACK; 97 const SkColor kDefaultColorBackgroundTabText = SK_ColorBLACK;
102 #else 98 #else
103 const SkColor kDefaultColorBackgroundTabText = SkColorSetRGB(64, 64, 64); 99 const SkColor kDefaultColorBackgroundTabText = SkColorSetRGB(64, 64, 64);
104 #endif 100 #endif
105 const SkColor kDefaultColorBookmarkText = SK_ColorBLACK; 101 const SkColor kDefaultColorBookmarkText = SK_ColorBLACK;
106 #if defined(OS_WIN) 102 #if defined(OS_WIN)
107 const SkColor kDefaultColorNTPBackground = 103 const SkColor kDefaultColorNTPBackground =
108 color_utils::GetSysSkColor(COLOR_WINDOW); 104 color_utils::GetSysSkColor(COLOR_WINDOW);
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 void ThemeService::OnInfobarDisplayed() { 709 void ThemeService::OnInfobarDisplayed() {
714 number_of_infobars_++; 710 number_of_infobars_++;
715 } 711 }
716 712
717 void ThemeService::OnInfobarDestroyed() { 713 void ThemeService::OnInfobarDestroyed() {
718 number_of_infobars_--; 714 number_of_infobars_--;
719 715
720 if (number_of_infobars_ == 0) 716 if (number_of_infobars_ == 0)
721 RemoveUnusedThemes(); 717 RemoveUnusedThemes();
722 } 718 }
OLDNEW
« no previous file with comments | « chrome/app/theme/touch_100_percent/common/find_prev_pressed.png ('k') | chrome/browser/ui/views/dropdown_bar_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698