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

Side by Side Diff: ash/shell.h

Issue 2237903003: mash: Migrate Shelf aura::Window uses to WmWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move shelf notify functions to WmShell. Created 4 years, 4 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_widget_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 <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 239
240 // Called when a casting session is started or stopped. 240 // Called when a casting session is started or stopped.
241 void OnCastingSessionStartedOrStopped(bool started); 241 void OnCastingSessionStartedOrStopped(bool started);
242 242
243 // Called when a root window is created. 243 // Called when a root window is created.
244 void OnRootWindowAdded(WmWindow* root_window); 244 void OnRootWindowAdded(WmWindow* root_window);
245 245
246 // Initializes |shelf_|. Does nothing if it's already initialized. 246 // Initializes |shelf_|. Does nothing if it's already initialized.
247 void CreateShelf(); 247 void CreateShelf();
248 248
249 // Called when the shelf is created for |root_window|.
250 void OnShelfCreatedForRootWindow(WmWindow* root_window);
251
252 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already 249 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already
253 // exists. 250 // exists.
254 void CreateKeyboard(); 251 void CreateKeyboard();
255 252
256 // Deactivates the virtual keyboard. 253 // Deactivates the virtual keyboard.
257 void DeactivateKeyboard(); 254 void DeactivateKeyboard();
258 255
259 // Show shelf view if it was created hidden (before session has started). 256 // Show shelf view if it was created hidden (before session has started).
260 void ShowShelf(); 257 void ShowShelf();
261 258
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 aura::client::ActivationClient* activation_client() { 346 aura::client::ActivationClient* activation_client() {
350 return activation_client_; 347 return activation_client_;
351 } 348 }
352 349
353 base::SequencedWorkerPool* blocking_pool() { return blocking_pool_; } 350 base::SequencedWorkerPool* blocking_pool() { return blocking_pool_; }
354 351
355 // Force the shelf to query for it's current visibility state. 352 // Force the shelf to query for it's current visibility state.
356 // TODO(jamescook): Move to Shelf. 353 // TODO(jamescook): Move to Shelf.
357 void UpdateShelfVisibility(); 354 void UpdateShelfVisibility();
358 355
359 // Called when the alignment for a shelf changes.
360 // TODO(jamescook): Move to Shelf.
361 void OnShelfAlignmentChanged(WmWindow* root_window);
362
363 // Called when the auto-hide behavior for a shelf changes.
364 // TODO(jamescook): Move to Shelf.
365 void OnShelfAutoHideBehaviorChanged(WmWindow* root_window);
366
367 // Creates a modal background (a partially-opaque fullscreen window) 356 // Creates a modal background (a partially-opaque fullscreen window)
368 // on all displays for |window|. 357 // on all displays for |window|.
369 void CreateModalBackground(aura::Window* window); 358 void CreateModalBackground(aura::Window* window);
370 359
371 // Called when a modal window is removed. It will activate 360 // Called when a modal window is removed. It will activate
372 // another modal window if any, or remove modal screens 361 // another modal window if any, or remove modal screens
373 // on all displays. 362 // on all displays.
374 void OnModalWindowRemoved(aura::Window* removed); 363 void OnModalWindowRemoved(aura::Window* removed);
375 364
376 // Returns WebNotificationTray on the primary root window. 365 // Returns WebNotificationTray on the primary root window.
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 base::SequencedWorkerPool* blocking_pool_; 603 base::SequencedWorkerPool* blocking_pool_;
615 604
616 bool in_mus_ = false; 605 bool in_mus_ = false;
617 606
618 DISALLOW_COPY_AND_ASSIGN(Shell); 607 DISALLOW_COPY_AND_ASSIGN(Shell);
619 }; 608 };
620 609
621 } // namespace ash 610 } // namespace ash
622 611
623 #endif // ASH_SHELL_H_ 612 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698