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

Side by Side Diff: ash/shelf/shelf_layout_manager.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.cc ('k') | ash/shelf/shelf_view_unittest.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 void OnLockStateEvent(LockStateObserver::EventType event) override; 180 void OnLockStateEvent(LockStateObserver::EventType event) override;
181 181
182 // Overridden from ash::SessionStateObserver: 182 // Overridden from ash::SessionStateObserver:
183 void SessionStateChanged(SessionStateDelegate::SessionState state) override; 183 void SessionStateChanged(SessionStateDelegate::SessionState state) override;
184 184
185 // TODO(msw): Remove these accessors, kept temporarily to simplify changes. 185 // TODO(msw): Remove these accessors, kept temporarily to simplify changes.
186 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) { 186 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
187 shelf_->shelf()->SetAutoHideBehavior(behavior); 187 shelf_->shelf()->SetAutoHideBehavior(behavior);
188 } 188 }
189 ShelfAutoHideBehavior auto_hide_behavior() const { 189 ShelfAutoHideBehavior auto_hide_behavior() const {
190 return shelf_->shelf()->GetAutoHideBehavior(); 190 return shelf_->shelf()->auto_hide_behavior();
191 } 191 }
192 192
193 // TODO(msw): Remove these accessors, kept temporarily to simplify changes. 193 // TODO(msw): Remove these accessors, kept temporarily to simplify changes.
194 void SetAlignment(wm::ShelfAlignment alignment) { 194 void SetAlignment(wm::ShelfAlignment alignment) {
195 shelf_->shelf()->SetAlignment(alignment); 195 shelf_->shelf()->SetAlignment(alignment);
196 } 196 }
197 wm::ShelfAlignment GetAlignment() const { return shelf_->GetAlignment(); } 197 wm::ShelfAlignment GetAlignment() const { return shelf_->GetAlignment(); }
198 198
199 // TODO(harrym|oshima): These templates will be moved to a new Shelf class. 199 // TODO(harrym|oshima): These templates will be moved to a new Shelf class.
200 // A helper function for choosing values specific to a shelf alignment. 200 // A helper function for choosing values specific to a shelf alignment.
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 416
417 std::unique_ptr<RootWindowControllerObserverImpl> 417 std::unique_ptr<RootWindowControllerObserverImpl>
418 root_window_controller_observer_; 418 root_window_controller_observer_;
419 419
420 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 420 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
421 }; 421 };
422 422
423 } // namespace ash 423 } // namespace ash
424 424
425 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 425 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698