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

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: nits 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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 } 240 }
241 241
242 // This dummy class is used for shell unit tests. We dont have chrome delegate 242 // This dummy class is used for shell unit tests. We dont have chrome delegate
243 // in these tests. 243 // in these tests.
244 class DummyUserWallpaperDelegate : public UserWallpaperDelegate { 244 class DummyUserWallpaperDelegate : public UserWallpaperDelegate {
245 public: 245 public:
246 DummyUserWallpaperDelegate() {} 246 DummyUserWallpaperDelegate() {}
247 247
248 virtual ~DummyUserWallpaperDelegate() {} 248 virtual ~DummyUserWallpaperDelegate() {}
249 249
250 virtual void SetLoggedInUserWallpaper() OVERRIDE { 250 virtual void InitializeWallpaper() OVERRIDE {
251 ash::Shell::GetInstance()->desktop_background_controller()-> 251 ash::Shell::GetInstance()->desktop_background_controller()->
252 CreateEmptyWallpaper(); 252 CreateEmptyWallpaper();
253 } 253 }
254 254
255 virtual void OpenSetWallpaperPage() OVERRIDE { 255 virtual void OpenSetWallpaperPage() OVERRIDE {
256 } 256 }
257 257
258 virtual bool CanOpenSetWallpaperPage() OVERRIDE { 258 virtual bool CanOpenSetWallpaperPage() OVERRIDE {
259 return false; 259 return false;
260 } 260 }
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 focus_cycler_->AddWidget(status_area_widget_); 854 focus_cycler_->AddWidget(status_area_widget_);
855 855
856 if (!delegate_.get() || delegate_->IsUserLoggedIn()) 856 if (!delegate_.get() || delegate_->IsUserLoggedIn())
857 CreateLauncher(); 857 CreateLauncher();
858 858
859 // Force a layout. 859 // Force a layout.
860 root_window->layout_manager()->OnWindowResized(); 860 root_window->layout_manager()->OnWindowResized();
861 861
862 // It needs to be created after OnWindowResized has been called, otherwise the 862 // It needs to be created after OnWindowResized has been called, otherwise the
863 // widget will not paint when restoring after a browser crash. 863 // widget will not paint when restoring after a browser crash.
864 user_wallpaper_delegate_->SetLoggedInUserWallpaper(); 864 user_wallpaper_delegate_->InitializeWallpaper();
865 865
866 window_modality_controller_.reset(new internal::WindowModalityController); 866 window_modality_controller_.reset(new internal::WindowModalityController);
867 AddEnvEventFilter(window_modality_controller_.get()); 867 AddEnvEventFilter(window_modality_controller_.get());
868 868
869 visibility_controller_.reset(new internal::VisibilityController); 869 visibility_controller_.reset(new internal::VisibilityController);
870 aura::client::SetVisibilityClient(root_window, visibility_controller_.get()); 870 aura::client::SetVisibilityClient(root_window, visibility_controller_.get());
871 871
872 drag_drop_controller_.reset(new internal::DragDropController); 872 drag_drop_controller_.reset(new internal::DragDropController);
873 aura::client::SetDragDropClient(root_window, drag_drop_controller_.get()); 873 aura::client::SetDragDropClient(root_window, drag_drop_controller_.get());
874 874
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 void Shell::SetCursor(gfx::NativeCursor cursor) { 1106 void Shell::SetCursor(gfx::NativeCursor cursor) {
1107 // TODO(oshima): set cursor to all root windows. 1107 // TODO(oshima): set cursor to all root windows.
1108 GetPrimaryRootWindow()->SetCursor(cursor); 1108 GetPrimaryRootWindow()->SetCursor(cursor);
1109 } 1109 }
1110 1110
1111 void Shell::ShowCursor(bool visible) { 1111 void Shell::ShowCursor(bool visible) {
1112 GetPrimaryRootWindow()->ShowCursor(visible); 1112 GetPrimaryRootWindow()->ShowCursor(visible);
1113 } 1113 }
1114 1114
1115 } // namespace ash 1115 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698