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

Side by Side Diff: ash/shell.h

Issue 2393083005: Moves Shell::CreateShelf() to WmShell (Closed)
Patch Set: fix shell Created 4 years, 2 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
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // Called when the screen is locked (after the lock window is visible) or 215 // Called when the screen is locked (after the lock window is visible) or
216 // unlocked. 216 // unlocked.
217 void OnLockStateChanged(bool locked); 217 void OnLockStateChanged(bool locked);
218 218
219 // Called when a casting session is started or stopped. 219 // Called when a casting session is started or stopped.
220 void OnCastingSessionStartedOrStopped(bool started); 220 void OnCastingSessionStartedOrStopped(bool started);
221 221
222 // Called when a root window is created. 222 // Called when a root window is created.
223 void OnRootWindowAdded(WmWindow* root_window); 223 void OnRootWindowAdded(WmWindow* root_window);
224 224
225 // Initializes |shelf_|. Does nothing if it's already initialized.
226 void CreateShelf();
227
228 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already 225 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already
229 // exists. 226 // exists.
230 void CreateKeyboard(); 227 void CreateKeyboard();
231 228
232 // Deactivates the virtual keyboard. 229 // Deactivates the virtual keyboard.
233 void DeactivateKeyboard(); 230 void DeactivateKeyboard();
234 231
235 #if defined(OS_CHROMEOS) 232 #if defined(OS_CHROMEOS)
236 // Test if MaximizeModeWindowManager is not enabled, and if 233 // Test if MaximizeModeWindowManager is not enabled, and if
237 // MaximizeModeController is not currently setting a display rotation. Or if 234 // MaximizeModeController is not currently setting a display rotation. Or if
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 std::unique_ptr<GPUSupport> gpu_support_; 551 std::unique_ptr<GPUSupport> gpu_support_;
555 552
556 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; 553 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
557 554
558 DISALLOW_COPY_AND_ASSIGN(Shell); 555 DISALLOW_COPY_AND_ASSIGN(Shell);
559 }; 556 };
560 557
561 } // namespace ash 558 } // namespace ash
562 559
563 #endif // ASH_SHELL_H_ 560 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698