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

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

Issue 15297013: Revert "InstantExtended: Prevent spurious themechanged/mostvisitedchanged events" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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/renderer/searchbox/searchbox.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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 }; 132 };
133 133
134 // The tiling of the theme background image. 134 // The tiling of the theme background image.
135 enum ThemeBackgroundImageTiling { 135 enum ThemeBackgroundImageTiling {
136 THEME_BKGRND_IMAGE_NO_REPEAT, 136 THEME_BKGRND_IMAGE_NO_REPEAT,
137 THEME_BKGRND_IMAGE_REPEAT_X, 137 THEME_BKGRND_IMAGE_REPEAT_X,
138 THEME_BKGRND_IMAGE_REPEAT_Y, 138 THEME_BKGRND_IMAGE_REPEAT_Y,
139 THEME_BKGRND_IMAGE_REPEAT, 139 THEME_BKGRND_IMAGE_REPEAT,
140 }; 140 };
141 141
142 // Update IsThemeInfoEqual in chrome/renderer/searchbox/searchbox.cc
143 // whenever any fields are added/removed.
144 struct ThemeBackgroundInfo { 142 struct ThemeBackgroundInfo {
145 ThemeBackgroundInfo(); 143 ThemeBackgroundInfo();
146 ~ThemeBackgroundInfo(); 144 ~ThemeBackgroundInfo();
147 145
148 // The theme background color in RGBA format where the R, G, B and A values 146 // The theme background color in RGBA format where the R, G, B and A values
149 // are between 0 and 255 inclusive and always valid. 147 // are between 0 and 255 inclusive and always valid.
150 int color_r; 148 int color_r;
151 int color_g; 149 int color_g;
152 int color_b; 150 int color_b;
153 int color_a; 151 int color_a;
(...skipping 15 matching lines...) Expand all
169 167
170 // The theme background image height. 168 // The theme background image height.
171 // Value is only valid if |theme_id| is valid. 169 // Value is only valid if |theme_id| is valid.
172 uint16 image_height; 170 uint16 image_height;
173 171
174 // True if theme has attribution logo. 172 // True if theme has attribution logo.
175 // Value is only valid if |theme_id| is valid. 173 // Value is only valid if |theme_id| is valid.
176 bool has_attribution; 174 bool has_attribution;
177 }; 175 };
178 176
179 // Update AreMostVisitedItemsEqual in chrome/renderer/searchbox/searchbox.cc
180 // whenever any fields are added/removed.
181 struct InstantMostVisitedItem { 177 struct InstantMostVisitedItem {
182 // The URL of the Most Visited item. 178 // The URL of the Most Visited item.
183 GURL url; 179 GURL url;
184 180
185 // The title of the Most Visited page. May be empty, in which case the |url| 181 // The title of the Most Visited page. May be empty, in which case the |url|
186 // is used as the title. 182 // is used as the title.
187 string16 title; 183 string16 title;
188 }; 184 };
189 185
190 // An InstantMostVisitedItem along with its assigned restricted ID. 186 // An InstantMostVisitedItem along with its assigned restricted ID.
191 typedef std::pair<InstantRestrictedID, InstantMostVisitedItem> 187 typedef std::pair<InstantRestrictedID, InstantMostVisitedItem>
192 InstantMostVisitedItemIDPair; 188 InstantMostVisitedItemIDPair;
193 189
194 #endif // CHROME_COMMON_INSTANT_TYPES_H_ 190 #endif // CHROME_COMMON_INSTANT_TYPES_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/searchbox/searchbox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698