| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 UI_AURA_SHELL_SHELL_H_ | 5 #ifndef UI_AURA_SHELL_SHELL_H_ |
| 6 #define UI_AURA_SHELL_SHELL_H_ | 6 #define UI_AURA_SHELL_SHELL_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 } | 22 } |
| 23 namespace gfx { | 23 namespace gfx { |
| 24 class Rect; | 24 class Rect; |
| 25 } | 25 } |
| 26 | 26 |
| 27 namespace aura_shell { | 27 namespace aura_shell { |
| 28 | 28 |
| 29 class Launcher; | 29 class Launcher; |
| 30 class ShellAcceleratorController; | 30 class ShellAcceleratorController; |
| 31 class ShellDelegate; | 31 class ShellDelegate; |
| 32 class ShellTooltipManager; |
| 32 | 33 |
| 33 namespace internal { | 34 namespace internal { |
| 34 class AppList; | 35 class AppList; |
| 35 class DragDropController; | 36 class DragDropController; |
| 36 class ShadowController; | 37 class ShadowController; |
| 37 class ShelfLayoutController; | 38 class ShelfLayoutController; |
| 38 class ShellAcceleratorFilter; | 39 class ShellAcceleratorFilter; |
| 39 class WorkspaceController; | 40 class WorkspaceController; |
| 40 } | 41 } |
| 41 | 42 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 65 // Toggles between overview mode and normal mode. | 66 // Toggles between overview mode and normal mode. |
| 66 void ToggleOverview(); | 67 void ToggleOverview(); |
| 67 | 68 |
| 68 // Toggles app list. | 69 // Toggles app list. |
| 69 void ToggleAppList(); | 70 void ToggleAppList(); |
| 70 | 71 |
| 71 ShellAcceleratorController* accelerator_controller() { | 72 ShellAcceleratorController* accelerator_controller() { |
| 72 return accelerator_controller_.get(); | 73 return accelerator_controller_.get(); |
| 73 } | 74 } |
| 74 | 75 |
| 76 ShellTooltipManager* tooltip_manager() { |
| 77 return tooltip_manager_.get(); |
| 78 } |
| 79 |
| 75 ShellDelegate* delegate() { return delegate_.get(); } | 80 ShellDelegate* delegate() { return delegate_.get(); } |
| 76 Launcher* launcher() { return launcher_.get(); } | 81 Launcher* launcher() { return launcher_.get(); } |
| 77 | 82 |
| 78 // Made available for tests. | 83 // Made available for tests. |
| 79 internal::ShadowController* shadow_controller() { | 84 internal::ShadowController* shadow_controller() { |
| 80 return shadow_controller_.get(); | 85 return shadow_controller_.get(); |
| 81 } | 86 } |
| 82 | 87 |
| 83 private: | 88 private: |
| 84 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; | 89 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 106 scoped_ptr<internal::AppList> app_list_; | 111 scoped_ptr<internal::AppList> app_list_; |
| 107 | 112 |
| 108 scoped_ptr<internal::DragDropController> drag_drop_controller_; | 113 scoped_ptr<internal::DragDropController> drag_drop_controller_; |
| 109 scoped_ptr<internal::WorkspaceController> workspace_controller_; | 114 scoped_ptr<internal::WorkspaceController> workspace_controller_; |
| 110 scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_; | 115 scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_; |
| 111 scoped_ptr<internal::ShadowController> shadow_controller_; | 116 scoped_ptr<internal::ShadowController> shadow_controller_; |
| 112 | 117 |
| 113 // An event filter that pre-handles global accelerators. | 118 // An event filter that pre-handles global accelerators. |
| 114 scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_; | 119 scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_; |
| 115 | 120 |
| 121 scoped_ptr<ShellTooltipManager> tooltip_manager_; |
| 122 |
| 116 DISALLOW_COPY_AND_ASSIGN(Shell); | 123 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 117 }; | 124 }; |
| 118 | 125 |
| 119 } // namespace aura_shell | 126 } // namespace aura_shell |
| 120 | 127 |
| 121 #endif // UI_AURA_SHELL_SHELL_H_ | 128 #endif // UI_AURA_SHELL_SHELL_H_ |
| OLD | NEW |