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

Side by Side Diff: ash/shell.h

Issue 22429004: Refactor LauncherDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for OpenBrowserUsingShelfOnOhterDisplay fail 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
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 LauncherItemDelegateManager;
78 class LauncherModel; 79 class LauncherModel;
79 class MagnificationController; 80 class MagnificationController;
80 class MruWindowTracker; 81 class MruWindowTracker;
81 class NestedDispatcherController; 82 class NestedDispatcherController;
82 class PartialMagnificationController; 83 class PartialMagnificationController;
83 class PowerButtonController; 84 class PowerButtonController;
84 class RootWindowHostFactory; 85 class RootWindowHostFactory;
85 class ScreenAsh; 86 class ScreenAsh;
86 class LockStateController; 87 class LockStateController;
87 class SessionStateDelegate; 88 class SessionStateDelegate;
88 class ShellDelegate; 89 class ShellDelegate;
89 class ShellObserver; 90 class ShellObserver;
90 class SystemTray; 91 class SystemTray;
91 class SystemTrayDelegate; 92 class SystemTrayDelegate;
92 class SystemTrayNotifier; 93 class SystemTrayNotifier;
93 class UserActivityDetector; 94 class UserActivityDetector;
94 class UserWallpaperDelegate; 95 class UserWallpaperDelegate;
95 class VideoDetector; 96 class VideoDetector;
96 class WebNotificationTray; 97 class WebNotificationTray;
97 class WindowCycleController; 98 class WindowCycleController;
98 class WindowSelectorController; 99 class WindowSelectorController;
99 100
100 namespace internal { 101 namespace internal {
101 class AcceleratorFilter; 102 class AcceleratorFilter;
102 class ActivationController; 103 class ActivationController;
103 class AppListController; 104 class AppListController;
105 class AppListLauncherItemDelegate;
104 class CaptureController; 106 class CaptureController;
105 class DisplayChangeObserver; 107 class DisplayChangeObserver;
106 class DisplayErrorObserver; 108 class DisplayErrorObserver;
107 class DisplayManager; 109 class DisplayManager;
108 class DragDropController; 110 class DragDropController;
109 class EventClientImpl; 111 class EventClientImpl;
110 class EventRewriterEventFilter; 112 class EventRewriterEventFilter;
111 class EventTransformationHandler; 113 class EventTransformationHandler;
112 class FocusCycler; 114 class FocusCycler;
113 class LocaleNotificationController; 115 class LocaleNotificationController;
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 return magnification_controller_.get(); 361 return magnification_controller_.get();
360 } 362 }
361 363
362 PartialMagnificationController* partial_magnification_controller() { 364 PartialMagnificationController* partial_magnification_controller() {
363 return partial_magnification_controller_.get(); 365 return partial_magnification_controller_.get();
364 } 366 }
365 aura::client::ActivationClient* activation_client() { 367 aura::client::ActivationClient* activation_client() {
366 return activation_client_; 368 return activation_client_;
367 } 369 }
368 370
371 LauncherItemDelegateManager* launcher_item_delegate_manager() {
372 return launcher_item_delegate_manager_.get();
373 }
374
369 ScreenAsh* screen() { return screen_; } 375 ScreenAsh* screen() { return screen_; }
370 376
371 // Force the shelf to query for it's current visibility state. 377 // Force the shelf to query for it's current visibility state.
372 void UpdateShelfVisibility(); 378 void UpdateShelfVisibility();
373 379
374 // TODO(oshima): Define an interface to access shelf/launcher 380 // TODO(oshima): Define an interface to access shelf/launcher
375 // state, or just use Launcher. 381 // state, or just use Launcher.
376 382
377 // Sets/gets the shelf auto-hide behavior on |root_window|. 383 // Sets/gets the shelf auto-hide behavior on |root_window|.
378 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior, 384 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior,
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 scoped_ptr<AcceleratorController> accelerator_controller_; 540 scoped_ptr<AcceleratorController> accelerator_controller_;
535 #endif // !defined(OS_MACOSX) 541 #endif // !defined(OS_MACOSX)
536 542
537 scoped_ptr<ShellDelegate> delegate_; 543 scoped_ptr<ShellDelegate> delegate_;
538 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; 544 scoped_ptr<SystemTrayDelegate> system_tray_delegate_;
539 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; 545 scoped_ptr<SystemTrayNotifier> system_tray_notifier_;
540 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 546 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
541 scoped_ptr<CapsLockDelegate> caps_lock_delegate_; 547 scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
542 scoped_ptr<SessionStateDelegate> session_state_delegate_; 548 scoped_ptr<SessionStateDelegate> session_state_delegate_;
543 scoped_ptr<LauncherDelegate> launcher_delegate_; 549 scoped_ptr<LauncherDelegate> launcher_delegate_;
550 scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;
551 scoped_ptr<internal::AppListLauncherItemDelegate>
552 app_list_launcher_item_delegate_;
544 553
545 scoped_ptr<LauncherModel> launcher_model_; 554 scoped_ptr<LauncherModel> launcher_model_;
546 555
547 scoped_ptr<internal::AppListController> app_list_controller_; 556 scoped_ptr<internal::AppListController> app_list_controller_;
548 557
549 scoped_ptr<internal::ActivationController> activation_controller_; 558 scoped_ptr<internal::ActivationController> activation_controller_;
550 scoped_ptr<internal::DragDropController> drag_drop_controller_; 559 scoped_ptr<internal::DragDropController> drag_drop_controller_;
551 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_; 560 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
552 scoped_ptr<views::corewm::ShadowController> shadow_controller_; 561 scoped_ptr<views::corewm::ShadowController> shadow_controller_;
553 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 562 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 bool simulate_modal_window_open_for_testing_; 638 bool simulate_modal_window_open_for_testing_;
630 639
631 bool is_touch_hud_projection_enabled_; 640 bool is_touch_hud_projection_enabled_;
632 641
633 DISALLOW_COPY_AND_ASSIGN(Shell); 642 DISALLOW_COPY_AND_ASSIGN(Shell);
634 }; 643 };
635 644
636 } // namespace ash 645 } // namespace ash
637 646
638 #endif // ASH_SHELL_H_ 647 #endif // ASH_SHELL_H_
OLDNEW
« ash/launcher/launcher_view.cc ('K') | « ash/launcher/launcher_view.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698