| 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 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 } | 594 } |
| 595 | 595 |
| 596 void SetTouchHudProjectionEnabled(bool enabled); | 596 void SetTouchHudProjectionEnabled(bool enabled); |
| 597 | 597 |
| 598 bool is_touch_hud_projection_enabled() const { | 598 bool is_touch_hud_projection_enabled() const { |
| 599 return is_touch_hud_projection_enabled_; | 599 return is_touch_hud_projection_enabled_; |
| 600 } | 600 } |
| 601 | 601 |
| 602 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); } | 602 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); } |
| 603 | 603 |
| 604 // TODO(sky): remove this. This was needed by sysui, but as sysui is going |
| 605 // away it should no longer be needed. |
| 604 bool in_mus() const { return in_mus_; } | 606 bool in_mus() const { return in_mus_; } |
| 605 | 607 |
| 606 #if defined(OS_CHROMEOS) | 608 #if defined(OS_CHROMEOS) |
| 607 // Creates instance of FirstRunHelper. Caller is responsible for deleting | 609 // Creates instance of FirstRunHelper. Caller is responsible for deleting |
| 608 // returned object. | 610 // returned object. |
| 609 ash::FirstRunHelper* CreateFirstRunHelper(); | 611 ash::FirstRunHelper* CreateFirstRunHelper(); |
| 610 | 612 |
| 611 // Toggles cursor compositing on/off. Native cursor is disabled when cursor | 613 // Toggles cursor compositing on/off. Native cursor is disabled when cursor |
| 612 // compositing is enabled, and vice versa. | 614 // compositing is enabled, and vice versa. |
| 613 void SetCursorCompositingEnabled(bool enabled); | 615 void SetCursorCompositingEnabled(bool enabled); |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 817 bool in_mus_ = false; | 819 bool in_mus_ = false; |
| 818 | 820 |
| 819 std::unique_ptr<KeyboardUI> keyboard_ui_; | 821 std::unique_ptr<KeyboardUI> keyboard_ui_; |
| 820 | 822 |
| 821 DISALLOW_COPY_AND_ASSIGN(Shell); | 823 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 822 }; | 824 }; |
| 823 | 825 |
| 824 } // namespace ash | 826 } // namespace ash |
| 825 | 827 |
| 826 #endif // ASH_SHELL_H_ | 828 #endif // ASH_SHELL_H_ |
| OLD | NEW |