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

Unified Diff: chrome/browser/ui/ntp_background_util.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
Index: chrome/browser/ui/ntp_background_util.cc
diff --git a/chrome/browser/ui/ntp_background_util.cc b/chrome/browser/ui/ntp_background_util.cc
index 853b23d30cababc7708ba28e934e1d6b50da7fc7..d10ea288d306df0406c57255e0359cfd0b379b2f 100644
--- a/chrome/browser/ui/ntp_background_util.cc
+++ b/chrome/browser/ui/ntp_background_util.cc
@@ -74,16 +74,13 @@ void NtpBackgroundUtil::PaintBackgroundDetachedMode(ui::ThemeProvider* tp,
canvas->FillRect(area, tp->GetColor(ThemeProperties::COLOR_NTP_BACKGROUND));
if (tp->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
- int tiling = ThemeProperties::NO_REPEAT;
- tp->GetDisplayProperty(ThemeProperties::NTP_BACKGROUND_TILING, &tiling);
- int alignment;
- if (tp->GetDisplayProperty(ThemeProperties::NTP_BACKGROUND_ALIGNMENT,
- &alignment)) {
- gfx::ImageSkia* ntp_background =
- tp->GetImageSkiaNamed(IDR_THEME_NTP_BACKGROUND);
+ int tiling = tp->GetDisplayProperty(ThemeProperties::NTP_BACKGROUND_TILING);
+ int alignment = tp->GetDisplayProperty(
+ ThemeProperties::NTP_BACKGROUND_ALIGNMENT);
+ gfx::ImageSkia* ntp_background =
+ tp->GetImageSkiaNamed(IDR_THEME_NTP_BACKGROUND);
- PaintThemeBackground(
- canvas, ntp_background, tiling, alignment, area, tab_contents_height);
- }
+ PaintThemeBackground(
+ canvas, ntp_background, tiling, alignment, area, tab_contents_height);
}
}

Powered by Google App Engine
This is Rietveld 408576698