| 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 <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 return root_window_host_factory_.get(); | 455 return root_window_host_factory_.get(); |
| 456 } | 456 } |
| 457 | 457 |
| 458 LauncherModel* launcher_model() { | 458 LauncherModel* launcher_model() { |
| 459 return launcher_model_.get(); | 459 return launcher_model_.get(); |
| 460 } | 460 } |
| 461 | 461 |
| 462 // Returns the launcher delegate, creating if necesary. | 462 // Returns the launcher delegate, creating if necesary. |
| 463 LauncherDelegate* GetLauncherDelegate(); | 463 LauncherDelegate* GetLauncherDelegate(); |
| 464 | 464 |
| 465 void SetTouchHudProjectionEnabled(bool enabled); | 465 // Called when the preference for projection touch HUD is changed. It will |
| 466 | 466 // show or hide the HUD based on the new preference value. |
| 467 bool is_touch_hud_projection_enabled() const { | 467 void TouchHudProjectionEnabledChanged(bool enabled); |
| 468 return is_touch_hud_projection_enabled_; | |
| 469 } | |
| 470 | 468 |
| 471 private: | 469 private: |
| 472 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); | 470 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); |
| 473 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); | 471 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); |
| 474 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); | 472 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); |
| 475 friend class internal::RootWindowController; | 473 friend class internal::RootWindowController; |
| 476 friend class test::ShellTestApi; | 474 friend class test::ShellTestApi; |
| 477 friend class shell::WindowWatcher; | 475 friend class shell::WindowWatcher; |
| 478 | 476 |
| 479 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; | 477 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 603 views::corewm::CursorManager cursor_manager_; | 601 views::corewm::CursorManager cursor_manager_; |
| 604 | 602 |
| 605 ObserverList<ShellObserver> observers_; | 603 ObserverList<ShellObserver> observers_; |
| 606 | 604 |
| 607 // Used by ash/shell. | 605 // Used by ash/shell. |
| 608 content::BrowserContext* browser_context_; | 606 content::BrowserContext* browser_context_; |
| 609 | 607 |
| 610 // For testing only: simulate that a modal window is open | 608 // For testing only: simulate that a modal window is open |
| 611 bool simulate_modal_window_open_for_testing_; | 609 bool simulate_modal_window_open_for_testing_; |
| 612 | 610 |
| 613 bool is_touch_hud_projection_enabled_; | |
| 614 | |
| 615 DISALLOW_COPY_AND_ASSIGN(Shell); | 611 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 616 }; | 612 }; |
| 617 | 613 |
| 618 } // namespace ash | 614 } // namespace ash |
| 619 | 615 |
| 620 #endif // ASH_SHELL_H_ | 616 #endif // ASH_SHELL_H_ |
| OLD | NEW |