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

Unified Diff: chrome/browser/search/instant_service.cc

Issue 23614007: Use the normal Google logo for managed users for --enable-instant-extended-api (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed mac compile failure Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/themes/theme_properties.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search/instant_service.cc
diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc
index 196c8a3b1afb2eecc94912efb0b58c16bf6653ef..47d36d372ed88e4241190d977db191ba7df2443f 100644
--- a/chrome/browser/search/instant_service.cc
+++ b/chrome/browser/search/instant_service.cc
@@ -332,21 +332,17 @@ void InstantService::OnThemeChanged(ThemeService* theme_service) {
theme_info_->header_color = SkColorToRGBAColor(header_color);
theme_info_->section_border_color = SkColorToRGBAColor(section_border_color);
- // Set logo for the theme. By default, use alternate logo.
- theme_info_->logo_alternate = true;
- int logo_alternate = 0;
- if (theme_service->GetDisplayProperty(
- ThemeProperties::NTP_LOGO_ALTERNATE, &logo_alternate))
- theme_info_->logo_alternate = logo_alternate == 1;
+ int logo_alternate = theme_service->GetDisplayProperty(
+ ThemeProperties::NTP_LOGO_ALTERNATE);
+ theme_info_->logo_alternate = logo_alternate == 1;
if (theme_service->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
// Set theme id for theme background image url.
theme_info_->theme_id = theme_service->GetThemeID();
// Set theme background image horizontal alignment.
- int alignment = 0;
- theme_service->GetDisplayProperty(
- ThemeProperties::NTP_BACKGROUND_ALIGNMENT, &alignment);
+ int alignment = theme_service->GetDisplayProperty(
+ ThemeProperties::NTP_BACKGROUND_ALIGNMENT);
if (alignment & ThemeProperties::ALIGN_LEFT)
theme_info_->image_horizontal_alignment = THEME_BKGRND_IMAGE_ALIGN_LEFT;
else if (alignment & ThemeProperties::ALIGN_RIGHT)
@@ -363,9 +359,8 @@ void InstantService::OnThemeChanged(ThemeService* theme_service) {
theme_info_->image_vertical_alignment = THEME_BKGRND_IMAGE_ALIGN_CENTER;
// Set theme backgorund image tiling.
- int tiling = 0;
- theme_service->GetDisplayProperty(ThemeProperties::NTP_BACKGROUND_TILING,
- &tiling);
+ int tiling = theme_service->GetDisplayProperty(
+ ThemeProperties::NTP_BACKGROUND_TILING);
switch (tiling) {
case ThemeProperties::NO_REPEAT:
theme_info_->image_tiling = THEME_BKGRND_IMAGE_NO_REPEAT;
« no previous file with comments | « no previous file | chrome/browser/themes/theme_properties.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698