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

Side by Side Diff: ash/shell.h

Issue 97173003: ash: Rename more Launcher classes to Shelf*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: link chrome Created 7 years 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 | « ash/shelf/shelf_view_unittest.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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 class AccessibilityDelegate; 79 class AccessibilityDelegate;
80 class AshNativeCursorManager; 80 class AshNativeCursorManager;
81 class AutoclickController; 81 class AutoclickController;
82 class CapsLockDelegate; 82 class CapsLockDelegate;
83 class DesktopBackgroundController; 83 class DesktopBackgroundController;
84 class DisplayController; 84 class DisplayController;
85 class FirstRunHelper; 85 class FirstRunHelper;
86 class HighContrastController; 86 class HighContrastController;
87 class Launcher; 87 class Launcher;
88 class LauncherDelegate; 88 class LauncherDelegate;
89 class LauncherItemDelegate;
90 class LauncherItemDelegateManager;
91 class LockStateController; 89 class LockStateController;
92 class MagnificationController; 90 class MagnificationController;
93 class MediaDelegate; 91 class MediaDelegate;
94 class MruWindowTracker; 92 class MruWindowTracker;
95 class NestedDispatcherController; 93 class NestedDispatcherController;
96 class NewWindowDelegate; 94 class NewWindowDelegate;
97 class PartialMagnificationController; 95 class PartialMagnificationController;
98 class PowerButtonController; 96 class PowerButtonController;
99 class RootWindowHostFactory; 97 class RootWindowHostFactory;
100 class ScreenAsh; 98 class ScreenAsh;
101 class SessionStateDelegate; 99 class SessionStateDelegate;
100 class ShelfItemDelegateManager;
102 class ShelfModel; 101 class ShelfModel;
103 class ShellDelegate; 102 class ShellDelegate;
104 class ShellObserver; 103 class ShellObserver;
105 class StickyKeys; 104 class StickyKeys;
106 class SystemTray; 105 class SystemTray;
107 class SystemTrayDelegate; 106 class SystemTrayDelegate;
108 class SystemTrayNotifier; 107 class SystemTrayNotifier;
109 class UserActivityDetector; 108 class UserActivityDetector;
110 class UserWallpaperDelegate; 109 class UserWallpaperDelegate;
111 class VideoDetector; 110 class VideoDetector;
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 } 400 }
402 401
403 AutoclickController* autoclick_controller() { 402 AutoclickController* autoclick_controller() {
404 return autoclick_controller_.get(); 403 return autoclick_controller_.get();
405 } 404 }
406 405
407 aura::client::ActivationClient* activation_client() { 406 aura::client::ActivationClient* activation_client() {
408 return activation_client_; 407 return activation_client_;
409 } 408 }
410 409
411 LauncherItemDelegateManager* launcher_item_delegate_manager() { 410 ShelfItemDelegateManager* shelf_item_delegate_manager() {
412 return launcher_item_delegate_manager_.get(); 411 return shelf_item_delegate_manager_.get();
413 } 412 }
414 413
415 ScreenAsh* screen() { return screen_; } 414 ScreenAsh* screen() { return screen_; }
416 415
417 // Force the shelf to query for it's current visibility state. 416 // Force the shelf to query for it's current visibility state.
418 void UpdateShelfVisibility(); 417 void UpdateShelfVisibility();
419 418
420 // TODO(oshima): Define an interface to access shelf/launcher 419 // TODO(oshima): Define an interface to access shelf/launcher
421 // state, or just use Launcher. 420 // state, or just use Launcher.
422 421
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 scoped_ptr<ShellDelegate> delegate_; 593 scoped_ptr<ShellDelegate> delegate_;
595 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; 594 scoped_ptr<SystemTrayDelegate> system_tray_delegate_;
596 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; 595 scoped_ptr<SystemTrayNotifier> system_tray_notifier_;
597 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 596 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
598 scoped_ptr<CapsLockDelegate> caps_lock_delegate_; 597 scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
599 scoped_ptr<SessionStateDelegate> session_state_delegate_; 598 scoped_ptr<SessionStateDelegate> session_state_delegate_;
600 scoped_ptr<AccessibilityDelegate> accessibility_delegate_; 599 scoped_ptr<AccessibilityDelegate> accessibility_delegate_;
601 scoped_ptr<NewWindowDelegate> new_window_delegate_; 600 scoped_ptr<NewWindowDelegate> new_window_delegate_;
602 scoped_ptr<MediaDelegate> media_delegate_; 601 scoped_ptr<MediaDelegate> media_delegate_;
603 scoped_ptr<LauncherDelegate> launcher_delegate_; 602 scoped_ptr<LauncherDelegate> launcher_delegate_;
604 scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_; 603 scoped_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
605 604
606 scoped_ptr<ShelfModel> shelf_model_; 605 scoped_ptr<ShelfModel> shelf_model_;
607 scoped_ptr<WindowPositioner> window_positioner_; 606 scoped_ptr<WindowPositioner> window_positioner_;
608 607
609 scoped_ptr<internal::AppListController> app_list_controller_; 608 scoped_ptr<internal::AppListController> app_list_controller_;
610 609
611 scoped_ptr<internal::DragDropController> drag_drop_controller_; 610 scoped_ptr<internal::DragDropController> drag_drop_controller_;
612 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_; 611 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
613 scoped_ptr<views::corewm::ShadowController> shadow_controller_; 612 scoped_ptr<views::corewm::ShadowController> shadow_controller_;
614 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 613 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 bool simulate_modal_window_open_for_testing_; 696 bool simulate_modal_window_open_for_testing_;
698 697
699 bool is_touch_hud_projection_enabled_; 698 bool is_touch_hud_projection_enabled_;
700 699
701 DISALLOW_COPY_AND_ASSIGN(Shell); 700 DISALLOW_COPY_AND_ASSIGN(Shell);
702 }; 701 };
703 702
704 } // namespace ash 703 } // namespace ash
705 704
706 #endif // ASH_SHELL_H_ 705 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698