Index: ui/aura_shell/toplevel_layout_manager.h |
diff --git a/ui/aura_shell/toplevel_layout_manager.h b/ui/aura_shell/toplevel_layout_manager.h |
index 4c66ce7d2ead853c3211c3ea9cc0f8d4d7966bfc..a02b8b14992f0c65aeb790a626a610dfb590f14a 100644 |
--- a/ui/aura_shell/toplevel_layout_manager.h |
+++ b/ui/aura_shell/toplevel_layout_manager.h |
@@ -17,7 +17,7 @@ |
namespace aura_shell { |
namespace internal { |
-class ShelfLayoutController; |
+class ShelfLayoutManager; |
// ToplevelLayoutManager is the LayoutManager installed on a container that |
// hosts what the shell considers to be top-level windows. It is used if the |
@@ -29,7 +29,7 @@ class AURA_SHELL_EXPORT ToplevelLayoutManager : public aura::LayoutManager, |
ToplevelLayoutManager(); |
virtual ~ToplevelLayoutManager(); |
- void set_shelf(ShelfLayoutController* shelf) { shelf_ = shelf; } |
+ void set_shelf(ShelfLayoutManager* shelf) { shelf_ = shelf; } |
// LayoutManager overrides: |
virtual void OnWindowResized() OVERRIDE; |
@@ -58,7 +58,7 @@ class AURA_SHELL_EXPORT ToplevelLayoutManager : public aura::LayoutManager, |
// Set of windows we're listening to. |
Windows windows_; |
- ShelfLayoutController* shelf_; |
+ ShelfLayoutManager* shelf_; |
DISALLOW_COPY_AND_ASSIGN(ToplevelLayoutManager); |
}; |