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

Side by Side Diff: ash/shell.h

Issue 23874013: Remove old activation code and disable-focus-controller flags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | 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 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 class SystemTrayNotifier; 93 class SystemTrayNotifier;
94 class UserActivityDetector; 94 class UserActivityDetector;
95 class UserWallpaperDelegate; 95 class UserWallpaperDelegate;
96 class VideoDetector; 96 class VideoDetector;
97 class WebNotificationTray; 97 class WebNotificationTray;
98 class WindowCycleController; 98 class WindowCycleController;
99 class WindowSelectorController; 99 class WindowSelectorController;
100 100
101 namespace internal { 101 namespace internal {
102 class AcceleratorFilter; 102 class AcceleratorFilter;
103 class ActivationController;
104 class AppListController; 103 class AppListController;
105 class AppListLauncherItemDelegate; 104 class AppListLauncherItemDelegate;
106 class CaptureController; 105 class CaptureController;
107 class DisplayChangeObserver; 106 class DisplayChangeObserver;
108 class DisplayErrorObserver; 107 class DisplayErrorObserver;
109 class DisplayManager; 108 class DisplayManager;
110 class DragDropController; 109 class DragDropController;
111 class EventClientImpl; 110 class EventClientImpl;
112 class EventRewriterEventFilter; 111 class EventRewriterEventFilter;
113 class EventTransformationHandler; 112 class EventTransformationHandler;
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 scoped_ptr<SessionStateDelegate> session_state_delegate_; 547 scoped_ptr<SessionStateDelegate> session_state_delegate_;
549 scoped_ptr<LauncherDelegate> launcher_delegate_; 548 scoped_ptr<LauncherDelegate> launcher_delegate_;
550 scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_; 549 scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;
551 scoped_ptr<internal::AppListLauncherItemDelegate> 550 scoped_ptr<internal::AppListLauncherItemDelegate>
552 app_list_launcher_item_delegate_; 551 app_list_launcher_item_delegate_;
553 552
554 scoped_ptr<LauncherModel> launcher_model_; 553 scoped_ptr<LauncherModel> launcher_model_;
555 554
556 scoped_ptr<internal::AppListController> app_list_controller_; 555 scoped_ptr<internal::AppListController> app_list_controller_;
557 556
558 scoped_ptr<internal::ActivationController> activation_controller_;
559 scoped_ptr<internal::DragDropController> drag_drop_controller_; 557 scoped_ptr<internal::DragDropController> drag_drop_controller_;
560 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_; 558 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
561 scoped_ptr<views::corewm::ShadowController> shadow_controller_; 559 scoped_ptr<views::corewm::ShadowController> shadow_controller_;
562 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 560 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
563 scoped_ptr<views::corewm::WindowModalityController> 561 scoped_ptr<views::corewm::WindowModalityController>
564 window_modality_controller_; 562 window_modality_controller_;
565 scoped_ptr<views::corewm::TooltipController> tooltip_controller_; 563 scoped_ptr<views::corewm::TooltipController> tooltip_controller_;
566 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; 564 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
567 scoped_ptr<PowerButtonController> power_button_controller_; 565 scoped_ptr<PowerButtonController> power_button_controller_;
568 scoped_ptr<LockStateController> lock_state_controller_; 566 scoped_ptr<LockStateController> lock_state_controller_;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 bool simulate_modal_window_open_for_testing_; 636 bool simulate_modal_window_open_for_testing_;
639 637
640 bool is_touch_hud_projection_enabled_; 638 bool is_touch_hud_projection_enabled_;
641 639
642 DISALLOW_COPY_AND_ASSIGN(Shell); 640 DISALLOW_COPY_AND_ASSIGN(Shell);
643 }; 641 };
644 642
645 } // namespace ash 643 } // namespace ash
646 644
647 #endif // ASH_SHELL_H_ 645 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698