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

Side by Side Diff: ash/shell.h

Issue 1138523006: Enable keyboard accelerators while a menu is open (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 5 years, 3 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
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | ash/shell.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 class NestedAcceleratorController; 68 class NestedAcceleratorController;
69 class ShadowController; 69 class ShadowController;
70 class VisibilityController; 70 class VisibilityController;
71 class WindowModalityController; 71 class WindowModalityController;
72 } 72 }
73 73
74 namespace ash { 74 namespace ash {
75 75
76 class AcceleratorController; 76 class AcceleratorController;
77 class AccessibilityDelegate; 77 class AccessibilityDelegate;
78 class AshMenuEventFilterDelegate;
78 class AppListController; 79 class AppListController;
79 class AshNativeCursorManager; 80 class AshNativeCursorManager;
80 class AutoclickController; 81 class AutoclickController;
81 class BluetoothNotificationController; 82 class BluetoothNotificationController;
82 class CaptureController; 83 class CaptureController;
83 class DesktopBackgroundController; 84 class DesktopBackgroundController;
84 class DisplayChangeObserver; 85 class DisplayChangeObserver;
85 class DisplayColorManager; 86 class DisplayColorManager;
86 class DisplayConfiguratorAnimation; 87 class DisplayConfiguratorAnimation;
87 class WindowTreeHostManager; 88 class WindowTreeHostManager;
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 aura::Window* scoped_target_root_window_; 633 aura::Window* scoped_target_root_window_;
633 634
634 // The CompoundEventFilter owned by aura::Env object. 635 // The CompoundEventFilter owned by aura::Env object.
635 scoped_ptr< ::wm::CompoundEventFilter> env_filter_; 636 scoped_ptr< ::wm::CompoundEventFilter> env_filter_;
636 637
637 std::vector<WindowAndBoundsPair> to_restore_; 638 std::vector<WindowAndBoundsPair> to_restore_;
638 639
639 scoped_ptr<UserMetricsRecorder> user_metrics_recorder_; 640 scoped_ptr<UserMetricsRecorder> user_metrics_recorder_;
640 scoped_ptr< ::wm::NestedAcceleratorController> nested_accelerator_controller_; 641 scoped_ptr< ::wm::NestedAcceleratorController> nested_accelerator_controller_;
641 scoped_ptr<AcceleratorController> accelerator_controller_; 642 scoped_ptr<AcceleratorController> accelerator_controller_;
643 scoped_ptr<AshMenuEventFilterDelegate> menu_event_filter_delegate_;
642 scoped_ptr<ShellDelegate> delegate_; 644 scoped_ptr<ShellDelegate> delegate_;
643 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; 645 scoped_ptr<SystemTrayDelegate> system_tray_delegate_;
644 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; 646 scoped_ptr<SystemTrayNotifier> system_tray_notifier_;
645 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 647 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
646 scoped_ptr<SessionStateDelegate> session_state_delegate_; 648 scoped_ptr<SessionStateDelegate> session_state_delegate_;
647 scoped_ptr<AccessibilityDelegate> accessibility_delegate_; 649 scoped_ptr<AccessibilityDelegate> accessibility_delegate_;
648 scoped_ptr<NewWindowDelegate> new_window_delegate_; 650 scoped_ptr<NewWindowDelegate> new_window_delegate_;
649 scoped_ptr<MediaDelegate> media_delegate_; 651 scoped_ptr<MediaDelegate> media_delegate_;
650 scoped_ptr<ShelfDelegate> shelf_delegate_; 652 scoped_ptr<ShelfDelegate> shelf_delegate_;
651 scoped_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_; 653 scoped_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 763
762 // Injected content::GPUDataManager support. 764 // Injected content::GPUDataManager support.
763 scoped_ptr<GPUSupport> gpu_support_; 765 scoped_ptr<GPUSupport> gpu_support_;
764 766
765 DISALLOW_COPY_AND_ASSIGN(Shell); 767 DISALLOW_COPY_AND_ASSIGN(Shell);
766 }; 768 };
767 769
768 } // namespace ash 770 } // namespace ash
769 771
770 #endif // ASH_SHELL_H_ 772 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | ash/shell.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698