| 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 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 WindowPositioner* window_positioner() { return window_positioner_.get(); } | 378 WindowPositioner* window_positioner() { return window_positioner_.get(); } |
| 379 | 379 |
| 380 UserMetricsRecorder* metrics() { return user_metrics_recorder_.get(); } | 380 UserMetricsRecorder* metrics() { return user_metrics_recorder_.get(); } |
| 381 | 381 |
| 382 void SetTouchHudProjectionEnabled(bool enabled); | 382 void SetTouchHudProjectionEnabled(bool enabled); |
| 383 | 383 |
| 384 bool is_touch_hud_projection_enabled() const { | 384 bool is_touch_hud_projection_enabled() const { |
| 385 return is_touch_hud_projection_enabled_; | 385 return is_touch_hud_projection_enabled_; |
| 386 } | 386 } |
| 387 | 387 |
| 388 // TODO(sky): remove this. This was needed by sysui, but as sysui is going | |
| 389 // away it should no longer be needed. | |
| 390 bool in_mus() const { return in_mus_; } | |
| 391 | |
| 392 #if defined(OS_CHROMEOS) | 388 #if defined(OS_CHROMEOS) |
| 393 // Creates instance of FirstRunHelper. Caller is responsible for deleting | 389 // Creates instance of FirstRunHelper. Caller is responsible for deleting |
| 394 // returned object. | 390 // returned object. |
| 395 ash::FirstRunHelper* CreateFirstRunHelper(); | 391 ash::FirstRunHelper* CreateFirstRunHelper(); |
| 396 | 392 |
| 397 // Toggles cursor compositing on/off. Native cursor is disabled when cursor | 393 // Toggles cursor compositing on/off. Native cursor is disabled when cursor |
| 398 // compositing is enabled, and vice versa. | 394 // compositing is enabled, and vice versa. |
| 399 void SetCursorCompositingEnabled(bool enabled); | 395 void SetCursorCompositingEnabled(bool enabled); |
| 400 | 396 |
| 401 StickyKeysController* sticky_keys_controller() { | 397 StickyKeysController* sticky_keys_controller() { |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 // For testing only: simulate that a modal window is open | 549 // For testing only: simulate that a modal window is open |
| 554 bool simulate_modal_window_open_for_testing_; | 550 bool simulate_modal_window_open_for_testing_; |
| 555 | 551 |
| 556 bool is_touch_hud_projection_enabled_; | 552 bool is_touch_hud_projection_enabled_; |
| 557 | 553 |
| 558 // Injected content::GPUDataManager support. | 554 // Injected content::GPUDataManager support. |
| 559 std::unique_ptr<GPUSupport> gpu_support_; | 555 std::unique_ptr<GPUSupport> gpu_support_; |
| 560 | 556 |
| 561 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; | 557 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; |
| 562 | 558 |
| 563 bool in_mus_ = false; | |
| 564 | |
| 565 DISALLOW_COPY_AND_ASSIGN(Shell); | 559 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 566 }; | 560 }; |
| 567 | 561 |
| 568 } // namespace ash | 562 } // namespace ash |
| 569 | 563 |
| 570 #endif // ASH_SHELL_H_ | 564 #endif // ASH_SHELL_H_ |
| OLD | NEW |