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

Side by Side Diff: chrome/common/instant_types.h

Issue 16413002: Moved theme related state from BrowserInstantController to InstantService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 6 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/chrome_browser.gypi ('k') | chrome/common/instant_types.cc » ('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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef CHROME_COMMON_INSTANT_TYPES_H_ 5 #ifndef CHROME_COMMON_INSTANT_TYPES_H_
6 #define CHROME_COMMON_INSTANT_TYPES_H_ 6 #define CHROME_COMMON_INSTANT_TYPES_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 THEME_BKGRND_IMAGE_NO_REPEAT, 137 THEME_BKGRND_IMAGE_NO_REPEAT,
138 THEME_BKGRND_IMAGE_REPEAT_X, 138 THEME_BKGRND_IMAGE_REPEAT_X,
139 THEME_BKGRND_IMAGE_REPEAT_Y, 139 THEME_BKGRND_IMAGE_REPEAT_Y,
140 THEME_BKGRND_IMAGE_REPEAT, 140 THEME_BKGRND_IMAGE_REPEAT,
141 }; 141 };
142 142
143 struct ThemeBackgroundInfo { 143 struct ThemeBackgroundInfo {
144 ThemeBackgroundInfo(); 144 ThemeBackgroundInfo();
145 ~ThemeBackgroundInfo(); 145 ~ThemeBackgroundInfo();
146 146
147 bool operator==(const ThemeBackgroundInfo& rhs) const;
148
147 // The theme background color in RGBA format where the R, G, B and A values 149 // The theme background color in RGBA format where the R, G, B and A values
148 // are between 0 and 255 inclusive and always valid. 150 // are between 0 and 255 inclusive and always valid.
149 int color_r; 151 int color_r;
150 int color_g; 152 int color_g;
151 int color_b; 153 int color_b;
152 int color_a; 154 int color_a;
153 155
154 // The theme id for the theme background image. 156 // The theme id for the theme background image.
155 // Value is only valid if there's a custom theme background image. 157 // Value is only valid if there's a custom theme background image.
156 std::string theme_id; 158 std::string theme_id;
(...skipping 25 matching lines...) Expand all
182 // The title of the Most Visited page. May be empty, in which case the |url| 184 // The title of the Most Visited page. May be empty, in which case the |url|
183 // is used as the title. 185 // is used as the title.
184 string16 title; 186 string16 title;
185 }; 187 };
186 188
187 // An InstantMostVisitedItem along with its assigned restricted ID. 189 // An InstantMostVisitedItem along with its assigned restricted ID.
188 typedef std::pair<InstantRestrictedID, InstantMostVisitedItem> 190 typedef std::pair<InstantRestrictedID, InstantMostVisitedItem>
189 InstantMostVisitedItemIDPair; 191 InstantMostVisitedItemIDPair;
190 192
191 #endif // CHROME_COMMON_INSTANT_TYPES_H_ 193 #endif // CHROME_COMMON_INSTANT_TYPES_H_
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/instant_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698