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

Side by Side Diff: ash/shell.h

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes 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_window_watcher_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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 class AcceleratorController; 78 class AcceleratorController;
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;
88 class ShelfDelegate;
89 class LockStateController; 87 class LockStateController;
90 class MagnificationController; 88 class MagnificationController;
91 class MediaDelegate; 89 class MediaDelegate;
92 class MruWindowTracker; 90 class MruWindowTracker;
93 class NestedDispatcherController; 91 class NestedDispatcherController;
94 class NewWindowDelegate; 92 class NewWindowDelegate;
95 class PartialMagnificationController; 93 class PartialMagnificationController;
96 class PowerButtonController; 94 class PowerButtonController;
97 class RootWindowHostFactory; 95 class RootWindowHostFactory;
98 class ScreenAsh; 96 class ScreenAsh;
99 class SessionStateDelegate; 97 class SessionStateDelegate;
98 class Shelf;
99 class ShelfDelegate;
100 class ShelfItemDelegateManager; 100 class ShelfItemDelegateManager;
101 class ShelfModel; 101 class ShelfModel;
102 class ShellDelegate; 102 class ShellDelegate;
103 class ShellObserver; 103 class ShellObserver;
104 class StickyKeys; 104 class StickyKeys;
105 class SystemTray; 105 class SystemTray;
106 class SystemTrayDelegate; 106 class SystemTrayDelegate;
107 class SystemTrayNotifier; 107 class SystemTrayNotifier;
108 class UserActivityDetector; 108 class UserActivityDetector;
109 class UserWallpaperDelegate; 109 class UserWallpaperDelegate;
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|. 277 // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
278 void UpdateAfterLoginStatusChange(user::LoginStatus status); 278 void UpdateAfterLoginStatusChange(user::LoginStatus status);
279 279
280 // Called when the application is exiting. 280 // Called when the application is exiting.
281 void OnAppTerminating(); 281 void OnAppTerminating();
282 282
283 // Called when the screen is locked (after the lock window is visible) or 283 // Called when the screen is locked (after the lock window is visible) or
284 // unlocked. 284 // unlocked.
285 void OnLockStateChanged(bool locked); 285 void OnLockStateChanged(bool locked);
286 286
287 // Initializes |launcher_|. Does nothing if it's already initialized. 287 // Initializes |shelf_|. Does nothing if it's already initialized.
288 void CreateLauncher(); 288 void CreateShelf();
289 289
290 // Creates virtual keyboard. Deletes the old virtual keyboard if it's already 290 // Creates virtual keyboard. Deletes the old virtual keyboard if it's already
291 // exist. 291 // exist.
292 void CreateKeyboard(); 292 void CreateKeyboard();
293 293
294 // Show shelf view if it was created hidden (before session has started). 294 // Show shelf view if it was created hidden (before session has started).
295 void ShowLauncher(); 295 void ShowShelf();
296 296
297 // Adds/removes observer. 297 // Adds/removes observer.
298 void AddShellObserver(ShellObserver* observer); 298 void AddShellObserver(ShellObserver* observer);
299 void RemoveShellObserver(ShellObserver* observer); 299 void RemoveShellObserver(ShellObserver* observer);
300 300
301 keyboard::KeyboardController* keyboard_controller() { 301 keyboard::KeyboardController* keyboard_controller() {
302 return keyboard_controller_.get(); 302 return keyboard_controller_.get();
303 } 303 }
304 304
305 AcceleratorController* accelerator_controller() { 305 AcceleratorController* accelerator_controller() {
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 bool simulate_modal_window_open_for_testing_; 702 bool simulate_modal_window_open_for_testing_;
703 703
704 bool is_touch_hud_projection_enabled_; 704 bool is_touch_hud_projection_enabled_;
705 705
706 DISALLOW_COPY_AND_ASSIGN(Shell); 706 DISALLOW_COPY_AND_ASSIGN(Shell);
707 }; 707 };
708 708
709 } // namespace ash 709 } // namespace ash
710 710
711 #endif // ASH_SHELL_H_ 711 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698