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

Unified Diff: ash/desktop_background/desktop_background_controller.cc

Issue 10492003: Use a #fefefe solid color wallpaper background before user login for GAIA login flow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/desktop_background/desktop_background_resources.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/desktop_background/desktop_background_controller.cc
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
index 5994bf2326736021607071c81c048edc2cb3a8ed..e9d20af030f9672a61fc92fb609150f46a2c22fb 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -150,7 +150,7 @@ void DesktopBackgroundController::SetDesktopBackgroundSolidColorMode() {
// viewport when there are regions not covered by a layer:
// http://crbug.com/113445
ui::Layer* background_layer = new ui::Layer(ui::LAYER_SOLID_COLOR);
- background_layer->SetColor(SK_ColorBLACK);
+ background_layer->SetColor(SK_ColorWallpaperGray);
Nikita (slow) 2012/06/04 11:23:04 I'm not sure whether this affects other code paths
bshe 2012/06/04 13:46:22 I think we dont use the solid color background at
root_window_->GetChildById(
internal::kShellWindowId_DesktopBackgroundContainer)->
layer()->Add(background_layer);
@@ -180,9 +180,8 @@ void DesktopBackgroundController::OnWallpaperLoadCompleted(
}
void DesktopBackgroundController::CreateEmptyWallpaper() {
- gfx::ImageSkia dummy;
- internal::CreateDesktopBackground(dummy, CENTER, root_window_);
- desktop_background_mode_ = BACKGROUND_IMAGE;
+ SetDesktopBackgroundSolidColorMode();
+ desktop_background_mode_ = BACKGROUND_SOLID_COLOR;
}
} // namespace ash
« no previous file with comments | « no previous file | ash/desktop_background/desktop_background_resources.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698