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

Side by Side Diff: ash/shell.h

Issue 23606016: Refactor LauncherItemController and LauncherItemDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix for unittest.. Created 7 years, 2 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/shelf/app_list_shelf_item_delegate.cc ('k') | 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 namespace ash { 68 namespace ash {
69 69
70 class AcceleratorController; 70 class AcceleratorController;
71 class AshNativeCursorManager; 71 class AshNativeCursorManager;
72 class CapsLockDelegate; 72 class CapsLockDelegate;
73 class DesktopBackgroundController; 73 class DesktopBackgroundController;
74 class DisplayController; 74 class DisplayController;
75 class HighContrastController; 75 class HighContrastController;
76 class Launcher; 76 class Launcher;
77 class LauncherDelegate; 77 class LauncherDelegate;
78 class LauncherItemDelegate;
78 class LauncherItemDelegateManager; 79 class LauncherItemDelegateManager;
79 class LauncherModel; 80 class LauncherModel;
80 class MagnificationController; 81 class MagnificationController;
81 class MruWindowTracker; 82 class MruWindowTracker;
82 class NestedDispatcherController; 83 class NestedDispatcherController;
83 class PartialMagnificationController; 84 class PartialMagnificationController;
84 class PowerButtonController; 85 class PowerButtonController;
85 class RootWindowHostFactory; 86 class RootWindowHostFactory;
86 class ScreenAsh; 87 class ScreenAsh;
87 class LockStateController; 88 class LockStateController;
88 class SessionStateDelegate; 89 class SessionStateDelegate;
89 class ShellDelegate; 90 class ShellDelegate;
90 class ShellObserver; 91 class ShellObserver;
91 class SystemTray; 92 class SystemTray;
92 class SystemTrayDelegate; 93 class SystemTrayDelegate;
93 class SystemTrayNotifier; 94 class SystemTrayNotifier;
94 class UserActivityDetector; 95 class UserActivityDetector;
95 class UserWallpaperDelegate; 96 class UserWallpaperDelegate;
96 class VideoDetector; 97 class VideoDetector;
97 class WebNotificationTray; 98 class WebNotificationTray;
98 class WindowCycleController; 99 class WindowCycleController;
99 class WindowSelectorController; 100 class WindowSelectorController;
100 101
101 namespace internal { 102 namespace internal {
102 class AcceleratorFilter; 103 class AcceleratorFilter;
103 class AppListController; 104 class AppListController;
104 class AppListShelfItemDelegate;
105 class CaptureController; 105 class CaptureController;
106 class DisplayChangeObserver; 106 class DisplayChangeObserver;
107 class DisplayErrorObserver; 107 class DisplayErrorObserver;
108 class DisplayManager; 108 class DisplayManager;
109 class DragDropController; 109 class DragDropController;
110 class EventClientImpl; 110 class EventClientImpl;
111 class EventRewriterEventFilter; 111 class EventRewriterEventFilter;
112 class EventTransformationHandler; 112 class EventTransformationHandler;
113 class FocusCycler; 113 class FocusCycler;
114 class KeyboardUMAEventFilter; 114 class KeyboardUMAEventFilter;
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; 534 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
535 scoped_ptr<AcceleratorController> accelerator_controller_; 535 scoped_ptr<AcceleratorController> accelerator_controller_;
536 scoped_ptr<ShellDelegate> delegate_; 536 scoped_ptr<ShellDelegate> delegate_;
537 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; 537 scoped_ptr<SystemTrayDelegate> system_tray_delegate_;
538 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; 538 scoped_ptr<SystemTrayNotifier> system_tray_notifier_;
539 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 539 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
540 scoped_ptr<CapsLockDelegate> caps_lock_delegate_; 540 scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
541 scoped_ptr<SessionStateDelegate> session_state_delegate_; 541 scoped_ptr<SessionStateDelegate> session_state_delegate_;
542 scoped_ptr<LauncherDelegate> launcher_delegate_; 542 scoped_ptr<LauncherDelegate> launcher_delegate_;
543 scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_; 543 scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;
544 scoped_ptr<internal::AppListShelfItemDelegate>
545 app_list_shelf_item_delegate_;
546 544
547 scoped_ptr<LauncherModel> launcher_model_; 545 scoped_ptr<LauncherModel> launcher_model_;
548 546
549 scoped_ptr<internal::AppListController> app_list_controller_; 547 scoped_ptr<internal::AppListController> app_list_controller_;
550 548
551 scoped_ptr<internal::DragDropController> drag_drop_controller_; 549 scoped_ptr<internal::DragDropController> drag_drop_controller_;
552 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_; 550 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
553 scoped_ptr<views::corewm::ShadowController> shadow_controller_; 551 scoped_ptr<views::corewm::ShadowController> shadow_controller_;
554 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 552 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
555 scoped_ptr<views::corewm::WindowModalityController> 553 scoped_ptr<views::corewm::WindowModalityController>
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 bool simulate_modal_window_open_for_testing_; 629 bool simulate_modal_window_open_for_testing_;
632 630
633 bool is_touch_hud_projection_enabled_; 631 bool is_touch_hud_projection_enabled_;
634 632
635 DISALLOW_COPY_AND_ASSIGN(Shell); 633 DISALLOW_COPY_AND_ASSIGN(Shell);
636 }; 634 };
637 635
638 } // namespace ash 636 } // namespace ash
639 637
640 #endif // ASH_SHELL_H_ 638 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/app_list_shelf_item_delegate.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698