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

Side by Side Diff: ash/shell.h

Issue 2041423003: Converts ShellObserver from aura::Window to ash::WmWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/shelf_window_watcher.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 <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 class TouchObserverHUD; 156 class TouchObserverHUD;
157 class UserWallpaperDelegate; 157 class UserWallpaperDelegate;
158 class VirtualKeyboardController; 158 class VirtualKeyboardController;
159 class VideoActivityNotifier; 159 class VideoActivityNotifier;
160 class VideoDetector; 160 class VideoDetector;
161 class WebNotificationTray; 161 class WebNotificationTray;
162 class WindowCycleController; 162 class WindowCycleController;
163 class WindowPositioner; 163 class WindowPositioner;
164 class WindowSelectorController; 164 class WindowSelectorController;
165 class WmShellAura; 165 class WmShellAura;
166 class WmWindow;
166 167
167 namespace shell { 168 namespace shell {
168 class WindowWatcher; 169 class WindowWatcher;
169 } 170 }
170 171
171 namespace test { 172 namespace test {
172 class ShellTestApi; 173 class ShellTestApi;
173 } 174 }
174 175
175 // Shell is a singleton object that presents the Shell API and implements the 176 // Shell is a singleton object that presents the Shell API and implements the
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 void OnOverviewModeEnded(); 314 void OnOverviewModeEnded();
314 315
315 // Called after maximize mode has started, windows might still animate though. 316 // Called after maximize mode has started, windows might still animate though.
316 void OnMaximizeModeStarted(); 317 void OnMaximizeModeStarted();
317 318
318 // Called after maximize mode has ended, windows might still be returning to 319 // Called after maximize mode has ended, windows might still be returning to
319 // their original position. 320 // their original position.
320 void OnMaximizeModeEnded(); 321 void OnMaximizeModeEnded();
321 322
322 // Called when a root window is created. 323 // Called when a root window is created.
323 void OnRootWindowAdded(aura::Window* root_window); 324 void OnRootWindowAdded(WmWindow* root_window);
324 325
325 // Initializes |shelf_|. Does nothing if it's already initialized. 326 // Initializes |shelf_|. Does nothing if it's already initialized.
326 void CreateShelf(); 327 void CreateShelf();
327 328
328 // Called when the shelf is created for |root_window|. 329 // Called when the shelf is created for |root_window|.
329 void OnShelfCreatedForRootWindow(aura::Window* root_window); 330 void OnShelfCreatedForRootWindow(WmWindow* root_window);
330 331
331 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already 332 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already
332 // exists. 333 // exists.
333 void CreateKeyboard(); 334 void CreateKeyboard();
334 335
335 // Deactivates the virtual keyboard. 336 // Deactivates the virtual keyboard.
336 void DeactivateKeyboard(); 337 void DeactivateKeyboard();
337 338
338 // Show shelf view if it was created hidden (before session has started). 339 // Show shelf view if it was created hidden (before session has started).
339 void ShowShelf(); 340 void ShowShelf();
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 base::SequencedWorkerPool* blocking_pool() { 471 base::SequencedWorkerPool* blocking_pool() {
471 return blocking_pool_; 472 return blocking_pool_;
472 } 473 }
473 474
474 // Force the shelf to query for it's current visibility state. 475 // Force the shelf to query for it's current visibility state.
475 // TODO(jamescook): Move to Shelf. 476 // TODO(jamescook): Move to Shelf.
476 void UpdateShelfVisibility(); 477 void UpdateShelfVisibility();
477 478
478 // Called when the alignment for a shelf changes. 479 // Called when the alignment for a shelf changes.
479 // TODO(jamescook): Move to Shelf. 480 // TODO(jamescook): Move to Shelf.
480 void OnShelfAlignmentChanged(aura::Window* root_window); 481 void OnShelfAlignmentChanged(WmWindow* root_window);
481 482
482 // Called when the auto-hide behavior for a shelf changes. 483 // Called when the auto-hide behavior for a shelf changes.
483 // TODO(jamescook): Move to Shelf. 484 // TODO(jamescook): Move to Shelf.
484 void OnShelfAutoHideBehaviorChanged(aura::Window* root_window); 485 void OnShelfAutoHideBehaviorChanged(WmWindow* root_window);
485 486
486 // Notifies |observers_| when entering or exiting fullscreen mode in 487 // Notifies |observers_| when entering or exiting fullscreen mode in
487 // |root_window|. 488 // |root_window|.
488 void NotifyFullscreenStateChange(bool is_fullscreen, 489 void NotifyFullscreenStateChange(bool is_fullscreen, WmWindow* root_window);
489 aura::Window* root_window);
490 490
491 // Creates a modal background (a partially-opaque fullscreen window) 491 // Creates a modal background (a partially-opaque fullscreen window)
492 // on all displays for |window|. 492 // on all displays for |window|.
493 void CreateModalBackground(aura::Window* window); 493 void CreateModalBackground(aura::Window* window);
494 494
495 // Called when a modal window is removed. It will activate 495 // Called when a modal window is removed. It will activate
496 // another modal window if any, or remove modal screens 496 // another modal window if any, or remove modal screens
497 // on all displays. 497 // on all displays.
498 void OnModalWindowRemoved(aura::Window* removed); 498 void OnModalWindowRemoved(aura::Window* removed);
499 499
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 bool in_mus_ = false; 805 bool in_mus_ = false;
806 806
807 std::unique_ptr<KeyboardUI> keyboard_ui_; 807 std::unique_ptr<KeyboardUI> keyboard_ui_;
808 808
809 DISALLOW_COPY_AND_ASSIGN(Shell); 809 DISALLOW_COPY_AND_ASSIGN(Shell);
810 }; 810 };
811 811
812 } // namespace ash 812 } // namespace ash
813 813
814 #endif // ASH_SHELL_H_ 814 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698