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 #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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 // Initializes |shelf_|. Does nothing if it's already initialized. | 225 // Initializes |shelf_|. Does nothing if it's already initialized. |
226 void CreateShelf(); | 226 void CreateShelf(); |
227 | 227 |
228 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already | 228 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already |
229 // exists. | 229 // exists. |
230 void CreateKeyboard(); | 230 void CreateKeyboard(); |
231 | 231 |
232 // Deactivates the virtual keyboard. | 232 // Deactivates the virtual keyboard. |
233 void DeactivateKeyboard(); | 233 void DeactivateKeyboard(); |
234 | 234 |
235 // Show shelf view if it was created hidden (before session has started). | |
236 void ShowShelf(); | |
237 | |
238 #if defined(OS_CHROMEOS) | 235 #if defined(OS_CHROMEOS) |
239 // Test if MaximizeModeWindowManager is not enabled, and if | 236 // Test if MaximizeModeWindowManager is not enabled, and if |
240 // MaximizeModeController is not currently setting a display rotation. Or if | 237 // MaximizeModeController is not currently setting a display rotation. Or if |
241 // the |resolution_notification_controller_| is not showing its confirmation | 238 // the |resolution_notification_controller_| is not showing its confirmation |
242 // dialog. If true then changes to display settings can be saved. | 239 // dialog. If true then changes to display settings can be saved. |
243 bool ShouldSaveDisplaySettings(); | 240 bool ShouldSaveDisplaySettings(); |
244 #endif | 241 #endif |
245 | 242 |
246 AcceleratorControllerDelegateAura* accelerator_controller_delegate() { | 243 AcceleratorControllerDelegateAura* accelerator_controller_delegate() { |
247 return accelerator_controller_delegate_.get(); | 244 return accelerator_controller_delegate_.get(); |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 std::unique_ptr<GPUSupport> gpu_support_; | 554 std::unique_ptr<GPUSupport> gpu_support_; |
558 | 555 |
559 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; | 556 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; |
560 | 557 |
561 DISALLOW_COPY_AND_ASSIGN(Shell); | 558 DISALLOW_COPY_AND_ASSIGN(Shell); |
562 }; | 559 }; |
563 | 560 |
564 } // namespace ash | 561 } // namespace ash |
565 | 562 |
566 #endif // ASH_SHELL_H_ | 563 #endif // ASH_SHELL_H_ |
OLD | NEW |