Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Side by Side Diff: ash/shell.h

Issue 9224001: Fixes issue with accelerators when a menu is open (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changes as requested Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 18 matching lines...) Expand all
29 } 29 }
30 namespace views { 30 namespace views {
31 class NonClientFrameView; 31 class NonClientFrameView;
32 class Widget; 32 class Widget;
33 } 33 }
34 34
35 namespace ash { 35 namespace ash {
36 36
37 class AcceleratorController; 37 class AcceleratorController;
38 class Launcher; 38 class Launcher;
39 class NestedDispatcherController;
39 class PowerButtonController; 40 class PowerButtonController;
40 class ShellDelegate; 41 class ShellDelegate;
41 class VideoDetector; 42 class VideoDetector;
42 class WindowCycleController; 43 class WindowCycleController;
43 44
44 namespace internal { 45 namespace internal {
45 class ActivationController; 46 class ActivationController;
46 class AcceleratorFilter; 47 class AcceleratorFilter;
47 class AppList; 48 class AppList;
48 class DragDropController; 49 class DragDropController;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 // Sets the LayoutManager of the container with the specified id to NULL. This 163 // Sets the LayoutManager of the container with the specified id to NULL. This
163 // has the effect of deleting the current LayoutManager. 164 // has the effect of deleting the current LayoutManager.
164 void ResetLayoutManager(int container_id); 165 void ResetLayoutManager(int container_id);
165 166
166 static Shell* instance_; 167 static Shell* instance_;
167 168
168 std::vector<WindowAndBoundsPair> to_restore_; 169 std::vector<WindowAndBoundsPair> to_restore_;
169 170
170 base::WeakPtrFactory<Shell> method_factory_; 171 base::WeakPtrFactory<Shell> method_factory_;
171 172
173 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
174
172 scoped_ptr<AcceleratorController> accelerator_controller_; 175 scoped_ptr<AcceleratorController> accelerator_controller_;
173 176
174 scoped_ptr<ShellDelegate> delegate_; 177 scoped_ptr<ShellDelegate> delegate_;
175 178
176 scoped_ptr<Launcher> launcher_; 179 scoped_ptr<Launcher> launcher_;
177 180
178 scoped_ptr<internal::AppList> app_list_; 181 scoped_ptr<internal::AppList> app_list_;
179 182
180 scoped_ptr<internal::StackingController> stacking_controller_; 183 scoped_ptr<internal::StackingController> stacking_controller_;
181 scoped_ptr<internal::ActivationController> activation_controller_; 184 scoped_ptr<internal::ActivationController> activation_controller_;
(...skipping 20 matching lines...) Expand all
202 205
203 // Status area with clock, Wi-Fi signal, etc. 206 // Status area with clock, Wi-Fi signal, etc.
204 views::Widget* status_widget_; 207 views::Widget* status_widget_;
205 208
206 DISALLOW_COPY_AND_ASSIGN(Shell); 209 DISALLOW_COPY_AND_ASSIGN(Shell);
207 }; 210 };
208 211
209 } // namespace ash 212 } // namespace ash
210 213
211 #endif // ASH_SHELL_H_ 214 #endif // ASH_SHELL_H_
OLDNEW
« ash/accelerators/nested_dispatcher_controller.h ('K') | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698