OLD | NEW |
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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 using views::Widget; | 110 using views::Widget; |
111 | 111 |
112 // This dummy class is used for shell unit tests. We dont have chrome delegate | 112 // This dummy class is used for shell unit tests. We dont have chrome delegate |
113 // in these tests. | 113 // in these tests. |
114 class DummyUserWallpaperDelegate : public UserWallpaperDelegate { | 114 class DummyUserWallpaperDelegate : public UserWallpaperDelegate { |
115 public: | 115 public: |
116 DummyUserWallpaperDelegate() {} | 116 DummyUserWallpaperDelegate() {} |
117 | 117 |
118 virtual ~DummyUserWallpaperDelegate() {} | 118 virtual ~DummyUserWallpaperDelegate() {} |
119 | 119 |
| 120 virtual ash::WindowVisibilityAnimationType GetAnimationType() OVERRIDE { |
| 121 return WINDOW_VISIBILITY_ANIMATION_TYPE_FADE; |
| 122 } |
| 123 |
120 virtual void InitializeWallpaper() OVERRIDE { | 124 virtual void InitializeWallpaper() OVERRIDE { |
121 ash::Shell::GetInstance()->desktop_background_controller()-> | 125 ash::Shell::GetInstance()->desktop_background_controller()-> |
122 CreateEmptyWallpaper(); | 126 CreateEmptyWallpaper(); |
123 } | 127 } |
124 | 128 |
125 virtual void OpenSetWallpaperPage() OVERRIDE { | 129 virtual void OpenSetWallpaperPage() OVERRIDE { |
126 } | 130 } |
127 | 131 |
128 virtual bool CanOpenSetWallpaperPage() OVERRIDE { | 132 virtual bool CanOpenSetWallpaperPage() OVERRIDE { |
129 return false; | 133 return false; |
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
775 } | 779 } |
776 | 780 |
777 void Shell::ShowCursor(bool visible) { | 781 void Shell::ShowCursor(bool visible) { |
778 RootWindowList root_windows = GetAllRootWindows(); | 782 RootWindowList root_windows = GetAllRootWindows(); |
779 for (RootWindowList::iterator iter = root_windows.begin(); | 783 for (RootWindowList::iterator iter = root_windows.begin(); |
780 iter != root_windows.end(); ++iter) | 784 iter != root_windows.end(); ++iter) |
781 (*iter)->ShowCursor(visible); | 785 (*iter)->ShowCursor(visible); |
782 } | 786 } |
783 | 787 |
784 } // namespace ash | 788 } // namespace ash |
OLD | NEW |