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

Unified Diff: ash/wm/status_area_layout_manager.h

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 10 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
Index: ash/wm/status_area_layout_manager.h
diff --git a/ash/wm/status_area_layout_manager.h b/ash/wm/status_area_layout_manager.h
index cd12fe124e58452e8b6edede1d4fb1c0161be00b..8e6944dfacd51d48d8c0fbab87db2025bf1a2275 100644
--- a/ash/wm/status_area_layout_manager.h
+++ b/ash/wm/status_area_layout_manager.h
@@ -10,16 +10,15 @@
#include "ui/aura/layout_manager.h"
namespace ash {
+class ShelfWidget;
namespace internal {
-class ShelfLayoutManager;
-
// StatusAreaLayoutManager is a layout manager responsible for the status area.
// In any case when status area needs relayout it redirects this call to
// ShelfLayoutManager.
class StatusAreaLayoutManager : public aura::LayoutManager {
public:
- explicit StatusAreaLayoutManager(ShelfLayoutManager* shelf);
+ explicit StatusAreaLayoutManager(ShelfWidget* shelf);
virtual ~StatusAreaLayoutManager();
// Overridden from aura::LayoutManager:
@@ -41,7 +40,7 @@ class StatusAreaLayoutManager : public aura::LayoutManager {
// Used to prevent calling itself again from SetChildBounds().
bool in_layout_;
- ShelfLayoutManager* shelf_;
+ ShelfWidget* shelf_;
DISALLOW_COPY_AND_ASSIGN(StatusAreaLayoutManager);
};

Powered by Google App Engine
This is Rietveld 408576698