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_LAUNCHER_LAUNCHER_VIEW_H_ | 5 #ifndef ASH_LAUNCHER_LAUNCHER_VIEW_H_ |
6 #define ASH_LAUNCHER_LAUNCHER_VIEW_H_ | 6 #define ASH_LAUNCHER_LAUNCHER_VIEW_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 // Shows the overflow menu. | 85 // Shows the overflow menu. |
86 void ShowOverflowMenu(); | 86 void ShowOverflowMenu(); |
87 | 87 |
88 // If |view| represents TYPE_BROWSER_SHORTCUT Reset() is invoked on the | 88 // If |view| represents TYPE_BROWSER_SHORTCUT Reset() is invoked on the |
89 // LauncherWindowCycler. | 89 // LauncherWindowCycler. |
90 void MaybeResetWindowCycler(views::View* view); | 90 void MaybeResetWindowCycler(views::View* view); |
91 | 91 |
92 // Overridden from views::View: | 92 // Overridden from views::View: |
93 virtual gfx::Size GetPreferredSize() OVERRIDE; | 93 virtual gfx::Size GetPreferredSize() OVERRIDE; |
94 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; | 94 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; |
| 95 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; |
95 | 96 |
96 // Overridden from LauncherModelObserver: | 97 // Overridden from LauncherModelObserver: |
97 virtual void LauncherItemAdded(int model_index) OVERRIDE; | 98 virtual void LauncherItemAdded(int model_index) OVERRIDE; |
98 virtual void LauncherItemRemoved(int model_index) OVERRIDE; | 99 virtual void LauncherItemRemoved(int model_index) OVERRIDE; |
99 virtual void LauncherItemChanged(int model_index, | 100 virtual void LauncherItemChanged(int model_index, |
100 const ash::LauncherItem& old_item) OVERRIDE; | 101 const ash::LauncherItem& old_item) OVERRIDE; |
101 virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE; | 102 virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE; |
102 virtual void LauncherItemWillChange(int index) OVERRIDE; | 103 virtual void LauncherItemWillChange(int index) OVERRIDE; |
103 | 104 |
104 // Overridden from LauncherButtonHost: | 105 // Overridden from LauncherButtonHost: |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 // X coordinate of the mouse down event in |drag_view_|s coordinates. | 137 // X coordinate of the mouse down event in |drag_view_|s coordinates. |
137 int drag_offset_; | 138 int drag_offset_; |
138 | 139 |
139 // Index |drag_view_| was initially at. | 140 // Index |drag_view_| was initially at. |
140 int start_drag_index_; | 141 int start_drag_index_; |
141 | 142 |
142 #if !defined(OS_MACOSX) | 143 #if !defined(OS_MACOSX) |
143 scoped_ptr<views::MenuRunner> overflow_menu_runner_; | 144 scoped_ptr<views::MenuRunner> overflow_menu_runner_; |
144 #endif | 145 #endif |
145 | 146 |
| 147 ui::Accelerator ctrl_forward_key_; |
| 148 ui::Accelerator ctrl_back_key_; |
| 149 |
146 // Used to handle cycling among windows. | 150 // Used to handle cycling among windows. |
147 scoped_ptr<LauncherWindowCycler> cycler_; | 151 scoped_ptr<LauncherWindowCycler> cycler_; |
148 | 152 |
149 DISALLOW_COPY_AND_ASSIGN(LauncherView); | 153 DISALLOW_COPY_AND_ASSIGN(LauncherView); |
150 }; | 154 }; |
151 | 155 |
152 } // namespace internal | 156 } // namespace internal |
153 } // namespace ash | 157 } // namespace ash |
154 | 158 |
155 #endif // ASH_LAUNCHER_LAUNCHER_VIEW_H_ | 159 #endif // ASH_LAUNCHER_LAUNCHER_VIEW_H_ |
OLD | NEW |