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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 virtual void OpenSetWallpaperPage() OVERRIDE { | 131 virtual void OpenSetWallpaperPage() OVERRIDE { |
132 } | 132 } |
133 | 133 |
134 virtual bool CanOpenSetWallpaperPage() OVERRIDE { | 134 virtual bool CanOpenSetWallpaperPage() OVERRIDE { |
135 return false; | 135 return false; |
136 } | 136 } |
137 | 137 |
138 virtual void OnWallpaperAnimationFinished() OVERRIDE { | 138 virtual void OnWallpaperAnimationFinished() OVERRIDE { |
139 } | 139 } |
140 | 140 |
| 141 virtual void OnWallpaperBootAnimationFinished() OVERRIDE { |
| 142 } |
| 143 |
141 private: | 144 private: |
142 DISALLOW_COPY_AND_ASSIGN(DummyUserWallpaperDelegate); | 145 DISALLOW_COPY_AND_ASSIGN(DummyUserWallpaperDelegate); |
143 }; | 146 }; |
144 | 147 |
145 } // namespace | 148 } // namespace |
146 | 149 |
147 // static | 150 // static |
148 Shell* Shell::instance_ = NULL; | 151 Shell* Shell::instance_ = NULL; |
149 // static | 152 // static |
150 bool Shell::initially_hide_cursor_ = false; | 153 bool Shell::initially_hide_cursor_ = false; |
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
787 } | 790 } |
788 | 791 |
789 void Shell::ShowCursor(bool visible) { | 792 void Shell::ShowCursor(bool visible) { |
790 RootWindowList root_windows = GetAllRootWindows(); | 793 RootWindowList root_windows = GetAllRootWindows(); |
791 for (RootWindowList::iterator iter = root_windows.begin(); | 794 for (RootWindowList::iterator iter = root_windows.begin(); |
792 iter != root_windows.end(); ++iter) | 795 iter != root_windows.end(); ++iter) |
793 (*iter)->ShowCursor(visible); | 796 (*iter)->ShowCursor(visible); |
794 } | 797 } |
795 | 798 |
796 } // namespace ash | 799 } // namespace ash |
OLD | NEW |