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

Side by Side Diff: ash/shell.h

Issue 727583002: Regression: Search+Key pops up app launcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
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
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/metrics/user_metrics_recorder.h" 12 #include "ash/metrics/user_metrics_recorder.h"
13 #include "ash/shelf/shelf_types.h" 13 #include "ash/shelf/shelf_types.h"
14 #include "ash/system/user/login_status.h" 14 #include "ash/system/user/login_status.h"
15 #include "ash/wm/cursor_manager_chromeos.h" 15 #include "ash/wm/cursor_manager_chromeos.h"
16 #include "ash/wm/system_modal_container_event_filter_delegate.h" 16 #include "ash/wm/system_modal_container_event_filter_delegate.h"
17 #include "base/basictypes.h" 17 #include "base/basictypes.h"
18 #include "base/compiler_specific.h" 18 #include "base/compiler_specific.h"
19 #include "base/gtest_prod_util.h" 19 #include "base/gtest_prod_util.h"
20 #include "base/memory/scoped_ptr.h" 20 #include "base/memory/scoped_ptr.h"
21 #include "base/memory/weak_ptr.h" 21 #include "base/memory/weak_ptr.h"
22 #include "base/observer_list.h" 22 #include "base/observer_list.h"
23 #include "ui/aura/window.h" 23 #include "ui/aura/window.h"
24 #include "ui/base/accelerators/accelerator_history.h"
24 #include "ui/base/ui_base_types.h" 25 #include "ui/base/ui_base_types.h"
25 #include "ui/events/event_target.h" 26 #include "ui/events/event_target.h"
26 #include "ui/gfx/insets.h" 27 #include "ui/gfx/insets.h"
27 #include "ui/gfx/screen.h" 28 #include "ui/gfx/screen.h"
28 #include "ui/gfx/size.h" 29 #include "ui/gfx/size.h"
29 #include "ui/wm/core/cursor_manager.h" 30 #include "ui/wm/core/cursor_manager.h"
30 #include "ui/wm/public/activation_change_observer.h" 31 #include "ui/wm/public/activation_change_observer.h"
31 32
32 namespace app_list { 33 namespace app_list {
33 class AppListView; 34 class AppListView;
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 693
693 // An event filter for logging keyboard-related metrics. 694 // An event filter for logging keyboard-related metrics.
694 scoped_ptr<KeyboardUMAEventFilter> keyboard_metrics_filter_; 695 scoped_ptr<KeyboardUMAEventFilter> keyboard_metrics_filter_;
695 696
696 // An event filter which handles moving and resizing windows. 697 // An event filter which handles moving and resizing windows.
697 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_; 698 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_;
698 699
699 // An event filter which handles system level gestures 700 // An event filter which handles system level gestures
700 scoped_ptr<SystemGestureEventFilter> system_gesture_filter_; 701 scoped_ptr<SystemGestureEventFilter> system_gesture_filter_;
701 702
703 // A tracker for the current and previous accelerators.
704 scoped_ptr<ui::AcceleratorHistory> accelerator_history_;
705
702 // An event filter that pre-handles global accelerators. 706 // An event filter that pre-handles global accelerators.
703 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_; 707 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_;
704 708
705 // An event filter that pre-handles all key events to send them to an IME. 709 // An event filter that pre-handles all key events to send them to an IME.
706 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; 710 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_;
707 711
708 scoped_ptr<DisplayManager> display_manager_; 712 scoped_ptr<DisplayManager> display_manager_;
709 713
710 scoped_ptr<LocaleNotificationController> locale_notification_controller_; 714 scoped_ptr<LocaleNotificationController> locale_notification_controller_;
711 715
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 771
768 // Injected content::GPUDataManager support. 772 // Injected content::GPUDataManager support.
769 scoped_ptr<GPUSupport> gpu_support_; 773 scoped_ptr<GPUSupport> gpu_support_;
770 774
771 DISALLOW_COPY_AND_ASSIGN(Shell); 775 DISALLOW_COPY_AND_ASSIGN(Shell);
772 }; 776 };
773 777
774 } // namespace ash 778 } // namespace ash
775 779
776 #endif // ASH_SHELL_H_ 780 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698