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

Side by Side Diff: ash/common/shelf/shelf_layout_manager.h

Issue 2416253004: ash: Use session_manager::SessionState (Closed)
Patch Set: add comment about session state in SessionStaetDelegateChromeos Created 4 years, 2 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/common/session/session_state_observer.h ('k') | ash/common/shelf/shelf_layout_manager.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_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 WmWindow* lost_active) override; 141 WmWindow* lost_active) override;
142 142
143 // Overridden from keyboard::KeyboardControllerObserver: 143 // Overridden from keyboard::KeyboardControllerObserver:
144 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; 144 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
145 void OnKeyboardClosed() override; 145 void OnKeyboardClosed() override;
146 146
147 // Overridden from LockStateObserver: 147 // Overridden from LockStateObserver:
148 void OnLockStateEvent(LockStateObserver::EventType event) override; 148 void OnLockStateEvent(LockStateObserver::EventType event) override;
149 149
150 // Overridden from SessionStateObserver: 150 // Overridden from SessionStateObserver:
151 void SessionStateChanged(SessionStateDelegate::SessionState state) override; 151 void SessionStateChanged(session_manager::SessionState state) override;
152 152
153 // TODO(msw): Remove these accessors, kept temporarily to simplify changes. 153 // TODO(msw): Remove these accessors, kept temporarily to simplify changes.
154 ShelfAlignment GetAlignment() const { return shelf_widget_->GetAlignment(); } 154 ShelfAlignment GetAlignment() const { return shelf_widget_->GetAlignment(); }
155 155
156 // TODO(harrym|oshima): These templates will be moved to a new Shelf class. 156 // TODO(harrym|oshima): These templates will be moved to a new Shelf class.
157 // A helper function for choosing values specific to a shelf alignment. 157 // A helper function for choosing values specific to a shelf alignment.
158 template <typename T> 158 template <typename T>
159 T SelectValueForShelfAlignment(T bottom, T left, T right) const { 159 T SelectValueForShelfAlignment(T bottom, T left, T right) const {
160 switch (GetAlignment()) { 160 switch (GetAlignment()) {
161 case SHELF_ALIGNMENT_BOTTOM: 161 case SHELF_ALIGNMENT_BOTTOM:
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 364
365 // The show hide animation duration override or 0 for default. 365 // The show hide animation duration override or 0 for default.
366 int duration_override_in_ms_; 366 int duration_override_in_ms_;
367 367
368 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 368 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
369 }; 369 };
370 370
371 } // namespace ash 371 } // namespace ash
372 372
373 #endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ 373 #endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/common/session/session_state_observer.h ('k') | ash/common/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698