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

Side by Side Diff: ash/shell.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, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/accelerators/focus_manager_factory.h" 10 #include "ash/accelerators/focus_manager_factory.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 } 237 }
238 238
239 // This dummy class is used for shell unit tests. We dont have chrome delegate 239 // This dummy class is used for shell unit tests. We dont have chrome delegate
240 // in these tests. 240 // in these tests.
241 class DummyUserWallpaperDelegate : public UserWallpaperDelegate { 241 class DummyUserWallpaperDelegate : public UserWallpaperDelegate {
242 public: 242 public:
243 DummyUserWallpaperDelegate() {} 243 DummyUserWallpaperDelegate() {}
244 244
245 virtual ~DummyUserWallpaperDelegate() {} 245 virtual ~DummyUserWallpaperDelegate() {}
246 246
247 virtual void SetLoggedInUserWallpaper() OVERRIDE { 247 virtual void InitializeWallpaper() OVERRIDE {
248 ash::Shell::GetInstance()->desktop_background_controller()-> 248 ash::Shell::GetInstance()->desktop_background_controller()->
249 CreateEmptyWallpaper(); 249 CreateEmptyWallpaper();
250 } 250 }
251 251
252 virtual void OpenSetWallpaperPage() OVERRIDE { 252 virtual void OpenSetWallpaperPage() OVERRIDE {
253 } 253 }
254 254
255 virtual bool CanOpenSetWallpaperPage() OVERRIDE { 255 virtual bool CanOpenSetWallpaperPage() OVERRIDE {
256 return false; 256 return false;
257 } 257 }
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 focus_cycler_->AddWidget(status_area_widget_); 803 focus_cycler_->AddWidget(status_area_widget_);
804 804
805 if (!delegate_.get() || delegate_->IsUserLoggedIn()) 805 if (!delegate_.get() || delegate_->IsUserLoggedIn())
806 CreateLauncher(); 806 CreateLauncher();
807 807
808 // Force a layout. 808 // Force a layout.
809 root_window->layout_manager()->OnWindowResized(); 809 root_window->layout_manager()->OnWindowResized();
810 810
811 // It needs to be created after OnWindowResized has been called, otherwise the 811 // It needs to be created after OnWindowResized has been called, otherwise the
812 // widget will not paint when restoring after a browser crash. 812 // widget will not paint when restoring after a browser crash.
813 user_wallpaper_delegate_->SetLoggedInUserWallpaper(); 813 user_wallpaper_delegate_->InitializeWallpaper();
814 814
815 window_modality_controller_.reset(new internal::WindowModalityController); 815 window_modality_controller_.reset(new internal::WindowModalityController);
816 AddRootWindowEventFilter(window_modality_controller_.get()); 816 AddRootWindowEventFilter(window_modality_controller_.get());
817 817
818 visibility_controller_.reset(new internal::VisibilityController); 818 visibility_controller_.reset(new internal::VisibilityController);
819 aura::client::SetVisibilityClient(root_window, visibility_controller_.get()); 819 aura::client::SetVisibilityClient(root_window, visibility_controller_.get());
820 820
821 drag_drop_controller_.reset(new internal::DragDropController); 821 drag_drop_controller_.reset(new internal::DragDropController);
822 aura::client::SetDragDropClient(root_window, drag_drop_controller_.get()); 822 aura::client::SetDragDropClient(root_window, drag_drop_controller_.get());
823 823
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1049 panel_container->SetLayoutManager(panel_layout_manager_); 1049 panel_container->SetLayoutManager(panel_layout_manager_);
1050 } 1050 }
1051 } 1051 }
1052 1052
1053 void Shell::DisableWorkspaceGridLayout() { 1053 void Shell::DisableWorkspaceGridLayout() {
1054 if (workspace_controller_.get()) 1054 if (workspace_controller_.get())
1055 workspace_controller_->workspace_manager()->set_grid_size(0); 1055 workspace_controller_->workspace_manager()->set_grid_size(0);
1056 } 1056 }
1057 1057
1058 } // namespace ash 1058 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698