Enable user change background image in settings page in Aura build.

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
+#include "ash/desktop_background/desktop_background_controller.h"
+#include "ash/desktop_background/desktop_background_resources.h"

[tfarina, 2012/03/12 17:24:32]

do you really need to include desktop_background_resources.h and
desktop_background_view.h?

+#include "ash/desktop_background/desktop_background_view.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime/input_method_event_filter.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/settings/tray_settings.h"
@@ skipping 280 matching lines @@
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
     : root_window_(new aura::RootWindow),
       root_filter_(NULL),
       delegate_(delegate),
       audio_controller_(NULL),
       brightness_controller_(NULL),
       power_status_controller_(NULL),
       shelf_(NULL),
-      desktop_background_mode_(BACKGROUND_IMAGE),
       root_window_layout_(NULL),
       status_widget_(NULL) {
 }
 
 Shell::~Shell() {
   RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
   RemoveRootWindowEventFilter(input_method_filter_.get());
   RemoveRootWindowEventFilter(window_modality_controller_.get());
 #if !defined(OS_MACOSX)
   RemoveRootWindowEventFilter(accelerator_filter_.get());
@@ skipping 146 matching lines @@
     tray_->AddTrayItem(tray_brightness);
     tray_->AddTrayItem(new internal::TraySettings());
   }
   if (!status_widget_)
     status_widget_ = internal::CreateStatusArea(tray_.get());
 
   aura::Window* default_container =
       GetContainer(internal::kShellWindowId_DefaultContainer);
   launcher_.reset(new Launcher(default_container));
 
+  // This controller needs to be set before SetupManagedWindowMode.
+  desktop_background_controller_.reset(new DesktopBackgroundController);
+
   InitLayoutManagers();
 
   if (!command_line->HasSwitch(switches::kAuraNoShadows))
     shadow_controller_.reset(new internal::ShadowController());
 
   focus_cycler_.reset(new internal::FocusCycler());
   focus_cycler_->AddWidget(status_widget_);
   focus_cycler_->AddWidget(launcher_->widget());
   launcher_->SetFocusCycler(focus_cycler_.get());
 
@@ skipping 43 matching lines @@
   if (workspace_controller_.get())
     workspace_controller_->ShowMenu(widget, location);
 }
 
 void Shell::ToggleAppList() {
   if (!app_list_.get())
     app_list_.reset(new internal::AppList);
   app_list_->SetVisible(!app_list_->IsVisible());
 }
 
-void Shell::SetDesktopBackgroundMode(BackgroundMode mode) {
-  if (mode == BACKGROUND_SOLID_COLOR) {
-    // Set a solid black background.
-    // TODO(derat): Remove this in favor of having the compositor only clear the
-    // viewport when there are regions not covered by a layer:
-    // http://crbug.com/113445
-    ui::Layer* background_layer = new ui::Layer(ui::Layer::LAYER_SOLID_COLOR);
-    background_layer->SetColor(SK_ColorBLACK);
-    GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)->
-        layer()->Add(background_layer);
-    root_window_layout_->SetBackgroundLayer(background_layer);
-    root_window_layout_->SetBackgroundWidget(NULL);
-  } else {
-    // Create the desktop background image.
-    root_window_layout_->SetBackgroundLayer(NULL);
-    root_window_layout_->SetBackgroundWidget(
-        internal::CreateDesktopBackground());
-  }
-  desktop_background_mode_ = mode;
-}
-
 bool Shell::IsScreenLocked() const {
   const aura::Window* lock_screen_container = GetContainer(
       internal::kShellWindowId_LockScreenContainer);
   return lock_screen_container->StopsEventPropagation();
 }
 
 bool Shell::IsModalWindowOpen() const {
   const aura::Window* modal_container = GetContainer(
       internal::kShellWindowId_SystemModalContainer);
   return !modal_container->children().empty();
@@ skipping 39 matching lines @@
       GetContainer(internal::kShellWindowId_DefaultContainer);
   // Workspace manager has its own layout managers.
   workspace_controller_.reset(
       new internal::WorkspaceController(default_container));
   workspace_controller_->workspace_manager()->set_shelf(shelf_layout_manager);
 
   // Ensure launcher is visible.
   launcher_->widget()->Show();
 
   // Create the desktop background image.
-  SetDesktopBackgroundMode(BACKGROUND_IMAGE);
+  desktop_background_controller_->SetDefaultDesktopBackgroundImage();
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash