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

Side by Side Diff: ash/shell.h

Issue 183853037: aura: Remove client::UserActionClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unrevert Created 6 years, 9 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
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »
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 22 matching lines...) Expand all
33 namespace app_list { 33 namespace app_list {
34 class AppListView; 34 class AppListView;
35 } 35 }
36 namespace aura { 36 namespace aura {
37 class EventFilter; 37 class EventFilter;
38 class RootWindow; 38 class RootWindow;
39 class Window; 39 class Window;
40 namespace client { 40 namespace client {
41 class ActivationClient; 41 class ActivationClient;
42 class FocusClient; 42 class FocusClient;
43 class UserActionClient;
44 } 43 }
45 } 44 }
46 namespace chromeos { 45 namespace chromeos {
47 class OutputConfigurator; 46 class OutputConfigurator;
48 } 47 }
49 48
50 namespace gfx { 49 namespace gfx {
51 class ImageSkia; 50 class ImageSkia;
52 class Point; 51 class Point;
53 class Rect; 52 class Rect;
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 scoped_ptr<VideoDetector> video_detector_; 658 scoped_ptr<VideoDetector> video_detector_;
660 scoped_ptr<WindowCycleController> window_cycle_controller_; 659 scoped_ptr<WindowCycleController> window_cycle_controller_;
661 scoped_ptr<WindowSelectorController> window_selector_controller_; 660 scoped_ptr<WindowSelectorController> window_selector_controller_;
662 scoped_ptr<internal::FocusCycler> focus_cycler_; 661 scoped_ptr<internal::FocusCycler> focus_cycler_;
663 scoped_ptr<DisplayController> display_controller_; 662 scoped_ptr<DisplayController> display_controller_;
664 scoped_ptr<HighContrastController> high_contrast_controller_; 663 scoped_ptr<HighContrastController> high_contrast_controller_;
665 scoped_ptr<MagnificationController> magnification_controller_; 664 scoped_ptr<MagnificationController> magnification_controller_;
666 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; 665 scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
667 scoped_ptr<AutoclickController> autoclick_controller_; 666 scoped_ptr<AutoclickController> autoclick_controller_;
668 scoped_ptr<aura::client::FocusClient> focus_client_; 667 scoped_ptr<aura::client::FocusClient> focus_client_;
669 scoped_ptr<aura::client::UserActionClient> user_action_client_;
670 aura::client::ActivationClient* activation_client_; 668 aura::client::ActivationClient* activation_client_;
671 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 669 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
672 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 670 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
673 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; 671 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
674 scoped_ptr<internal::EventClientImpl> event_client_; 672 scoped_ptr<internal::EventClientImpl> event_client_;
675 scoped_ptr<internal::EventTransformationHandler> 673 scoped_ptr<internal::EventTransformationHandler>
676 event_transformation_handler_; 674 event_transformation_handler_;
677 scoped_ptr<WindowTreeHostFactory> window_tree_host_factory_; 675 scoped_ptr<WindowTreeHostFactory> window_tree_host_factory_;
678 scoped_ptr<internal::LogoutConfirmationController> 676 scoped_ptr<internal::LogoutConfirmationController>
679 logout_confirmation_controller_; 677 logout_confirmation_controller_;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 744
747 // Injected content::GPUDataManager support. 745 // Injected content::GPUDataManager support.
748 scoped_ptr<GPUSupport> gpu_support_; 746 scoped_ptr<GPUSupport> gpu_support_;
749 747
750 DISALLOW_COPY_AND_ASSIGN(Shell); 748 DISALLOW_COPY_AND_ASSIGN(Shell);
751 }; 749 };
752 750
753 } // namespace ash 751 } // namespace ash
754 752
755 #endif // ASH_SHELL_H_ 753 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698