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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 164386: Merge 23081 - With the recent NNTP changes, we change the way themes work th... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 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 | « no previous file | chrome/browser/browser_theme_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/browser/browser_theme_provider.h:r23081
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #ifndef CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_ 5 #ifndef CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_
6 #define CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_ 6 #define CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 20 matching lines...) Expand all
31 static const char* kColorFrameInactive; 31 static const char* kColorFrameInactive;
32 static const char* kColorFrameIncognito; 32 static const char* kColorFrameIncognito;
33 static const char* kColorFrameIncognitoInactive; 33 static const char* kColorFrameIncognitoInactive;
34 static const char* kColorToolbar; 34 static const char* kColorToolbar;
35 static const char* kColorTabText; 35 static const char* kColorTabText;
36 static const char* kColorBackgroundTabText; 36 static const char* kColorBackgroundTabText;
37 static const char* kColorBookmarkText; 37 static const char* kColorBookmarkText;
38 static const char* kColorNTPBackground; 38 static const char* kColorNTPBackground;
39 static const char* kColorNTPText; 39 static const char* kColorNTPText;
40 static const char* kColorNTPLink; 40 static const char* kColorNTPLink;
41 static const char* kColorNTPHeader;
41 static const char* kColorNTPSection; 42 static const char* kColorNTPSection;
42 static const char* kColorNTPSectionText; 43 static const char* kColorNTPSectionText;
43 static const char* kColorNTPSectionLink; 44 static const char* kColorNTPSectionLink;
44 static const char* kColorControlBackground; 45 static const char* kColorControlBackground;
45 static const char* kColorButtonBackground; 46 static const char* kColorButtonBackground;
46 47
47 // Strings used by themes to identify tints to apply to different parts of 48 // Strings used by themes to identify tints to apply to different parts of
48 // our UI. The frame tints apply to the frame color and produce the 49 // our UI. The frame tints apply to the frame color and produce the
49 // COLOR_FRAME* colors. 50 // COLOR_FRAME* colors.
50 static const char* kTintButtons; 51 static const char* kTintButtons;
(...skipping 25 matching lines...) Expand all
76 static const SkColor kDefaultColorFrameInactive; 77 static const SkColor kDefaultColorFrameInactive;
77 static const SkColor kDefaultColorFrameIncognito; 78 static const SkColor kDefaultColorFrameIncognito;
78 static const SkColor kDefaultColorFrameIncognitoInactive; 79 static const SkColor kDefaultColorFrameIncognitoInactive;
79 static const SkColor kDefaultColorToolbar; 80 static const SkColor kDefaultColorToolbar;
80 static const SkColor kDefaultColorTabText; 81 static const SkColor kDefaultColorTabText;
81 static const SkColor kDefaultColorBackgroundTabText; 82 static const SkColor kDefaultColorBackgroundTabText;
82 static const SkColor kDefaultColorBookmarkText; 83 static const SkColor kDefaultColorBookmarkText;
83 static const SkColor kDefaultColorNTPBackground; 84 static const SkColor kDefaultColorNTPBackground;
84 static const SkColor kDefaultColorNTPText; 85 static const SkColor kDefaultColorNTPText;
85 static const SkColor kDefaultColorNTPLink; 86 static const SkColor kDefaultColorNTPLink;
87 static const SkColor kDefaultColorNTPHeader;
86 static const SkColor kDefaultColorNTPSection; 88 static const SkColor kDefaultColorNTPSection;
87 static const SkColor kDefaultColorNTPSectionText; 89 static const SkColor kDefaultColorNTPSectionText;
88 static const SkColor kDefaultColorNTPSectionLink; 90 static const SkColor kDefaultColorNTPSectionLink;
89 static const SkColor kDefaultColorControlBackground; 91 static const SkColor kDefaultColorControlBackground;
90 static const SkColor kDefaultColorButtonBackground; 92 static const SkColor kDefaultColorButtonBackground;
91 93
92 static const skia::HSL kDefaultTintButtons; 94 static const skia::HSL kDefaultTintButtons;
93 static const skia::HSL kDefaultTintFrame; 95 static const skia::HSL kDefaultTintFrame;
94 static const skia::HSL kDefaultTintFrameInactive; 96 static const skia::HSL kDefaultTintFrameInactive;
95 static const skia::HSL kDefaultTintFrameIncognito; 97 static const skia::HSL kDefaultTintFrameIncognito;
(...skipping 11 matching lines...) Expand all
107 COLOR_FRAME_INACTIVE, 109 COLOR_FRAME_INACTIVE,
108 COLOR_FRAME_INCOGNITO, 110 COLOR_FRAME_INCOGNITO,
109 COLOR_FRAME_INCOGNITO_INACTIVE, 111 COLOR_FRAME_INCOGNITO_INACTIVE,
110 COLOR_TOOLBAR, 112 COLOR_TOOLBAR,
111 COLOR_TAB_TEXT, 113 COLOR_TAB_TEXT,
112 COLOR_BACKGROUND_TAB_TEXT, 114 COLOR_BACKGROUND_TAB_TEXT,
113 COLOR_BOOKMARK_TEXT, 115 COLOR_BOOKMARK_TEXT,
114 COLOR_NTP_BACKGROUND, 116 COLOR_NTP_BACKGROUND,
115 COLOR_NTP_TEXT, 117 COLOR_NTP_TEXT,
116 COLOR_NTP_LINK, 118 COLOR_NTP_LINK,
119 COLOR_NTP_HEADER,
117 COLOR_NTP_SECTION, 120 COLOR_NTP_SECTION,
118 COLOR_NTP_SECTION_TEXT, 121 COLOR_NTP_SECTION_TEXT,
119 COLOR_NTP_SECTION_LINK, 122 COLOR_NTP_SECTION_LINK,
120 COLOR_CONTROL_BACKGROUND, 123 COLOR_CONTROL_BACKGROUND,
121 COLOR_BUTTON_BACKGROUND, 124 COLOR_BUTTON_BACKGROUND,
122 TINT_BUTTONS, 125 TINT_BUTTONS,
123 TINT_FRAME, 126 TINT_FRAME,
124 TINT_FRAME_INACTIVE, 127 TINT_FRAME_INACTIVE,
125 TINT_FRAME_INCOGNITO, 128 TINT_FRAME_INCOGNITO,
126 TINT_FRAME_INCOGNITO_INACTIVE, 129 TINT_FRAME_INCOGNITO_INACTIVE,
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 ImageMap images_; 326 ImageMap images_;
324 ColorMap colors_; 327 ColorMap colors_;
325 TintMap tints_; 328 TintMap tints_;
326 RawDataMap raw_data_; 329 RawDataMap raw_data_;
327 DisplayPropertyMap display_properties_; 330 DisplayPropertyMap display_properties_;
328 331
329 DISALLOW_COPY_AND_ASSIGN(BrowserThemeProvider); 332 DISALLOW_COPY_AND_ASSIGN(BrowserThemeProvider);
330 }; 333 };
331 334
332 #endif // CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_ 335 #endif // CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_theme_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698