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

Side by Side Diff: ash/shell.h

Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to Shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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_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 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 468
469 ShelfItemDelegateManager* shelf_item_delegate_manager() { 469 ShelfItemDelegateManager* shelf_item_delegate_manager() {
470 return shelf_item_delegate_manager_.get(); 470 return shelf_item_delegate_manager_.get();
471 } 471 }
472 472
473 base::SequencedWorkerPool* blocking_pool() { 473 base::SequencedWorkerPool* blocking_pool() {
474 return blocking_pool_; 474 return blocking_pool_;
475 } 475 }
476 476
477 // Force the shelf to query for it's current visibility state. 477 // Force the shelf to query for it's current visibility state.
478 // TODO(jamescook): Move to Shelf.
478 void UpdateShelfVisibility(); 479 void UpdateShelfVisibility();
479 480
480 // TODO(oshima): Define an interface to access shelf/launcher
481 // state, or just use Launcher.
482
483 // Sets/gets the shelf auto-hide behavior on |root_window|.
484 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior,
485 aura::Window* root_window);
486 ShelfAutoHideBehavior GetShelfAutoHideBehavior(
487 aura::Window* root_window) const;
488
489 // Sets/gets shelf's alignment on |root_window|.
490 void SetShelfAlignment(wm::ShelfAlignment alignment,
491 aura::Window* root_window);
492 wm::ShelfAlignment GetShelfAlignment(const aura::Window* root_window) const;
493
494 // Called when the alignment for a shelf changes. 481 // Called when the alignment for a shelf changes.
482 // TODO(jamescook): Move to Shelf.
495 void OnShelfAlignmentChanged(aura::Window* root_window); 483 void OnShelfAlignmentChanged(aura::Window* root_window);
496 484
497 // Called when the auto-hide behavior for a shelf changes. 485 // Called when the auto-hide behavior for a shelf changes.
486 // TODO(jamescook): Move to Shelf.
498 void OnShelfAutoHideBehaviorChanged(aura::Window* root_window); 487 void OnShelfAutoHideBehaviorChanged(aura::Window* root_window);
499 488
500 // Notifies |observers_| when entering or exiting fullscreen mode in 489 // Notifies |observers_| when entering or exiting fullscreen mode in
501 // |root_window|. 490 // |root_window|.
502 void NotifyFullscreenStateChange(bool is_fullscreen, 491 void NotifyFullscreenStateChange(bool is_fullscreen,
503 aura::Window* root_window); 492 aura::Window* root_window);
504 493
505 // Creates a modal background (a partially-opaque fullscreen window) 494 // Creates a modal background (a partially-opaque fullscreen window)
506 // on all displays for |window|. 495 // on all displays for |window|.
507 void CreateModalBackground(aura::Window* window); 496 void CreateModalBackground(aura::Window* window);
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 bool in_mus_ = false; 808 bool in_mus_ = false;
820 809
821 std::unique_ptr<KeyboardUI> keyboard_ui_; 810 std::unique_ptr<KeyboardUI> keyboard_ui_;
822 811
823 DISALLOW_COPY_AND_ASSIGN(Shell); 812 DISALLOW_COPY_AND_ASSIGN(Shell);
824 }; 813 };
825 814
826 } // namespace ash 815 } // namespace ash
827 816
828 #endif // ASH_SHELL_H_ 817 #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