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

Unified Diff: ash/shelf/shelf_locking_manager.h

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_locking_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_locking_manager.h
diff --git a/ash/shelf/shelf_locking_manager.h b/ash/shelf/shelf_locking_manager.h
index f8bba82b57a92956ce75293b470022713be02a66..54c8e4dd6bd1a56ed1cf2d95c48b7b7fe34c1fdb 100644
--- a/ash/shelf/shelf_locking_manager.h
+++ b/ash/shelf/shelf_locking_manager.h
@@ -12,14 +12,14 @@
namespace ash {
-class WmShelf;
+class Shelf;
// ShelfLockingManager observes screen and session events to align the shelf at
// the bottom of the screen when the screen is locked.
class ASH_EXPORT ShelfLockingManager : public SessionObserver,
public LockStateObserver {
public:
- explicit ShelfLockingManager(WmShelf* shelf);
+ explicit ShelfLockingManager(Shelf* shelf);
~ShelfLockingManager() override;
bool is_locked() const { return session_locked_ || screen_locked_; }
@@ -36,7 +36,7 @@ class ASH_EXPORT ShelfLockingManager : public SessionObserver,
// Update the shelf state for session and screen lock changes.
void UpdateLockedState();
- WmShelf* shelf_;
+ Shelf* shelf_;
bool session_locked_ = false;
bool screen_locked_ = false;
ShelfAlignment stored_alignment_;
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_locking_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698