Refactor: Shelf Widget

ash/shell/window_watcher.cc

Index: ash/shell/window_watcher.cc
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index 0711208b4c5ec1da9c9e90c3483a75ab00247f60..0963eb7cc96d2f5d2a86ba8e2481fa2027e7c1a2 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -7,6 +7,7 @@
 #include "ash/display/display_controller.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ui/aura/root_window.h"
@@ -39,7 +40,8 @@ class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
         internal::kShellWindowId_PanelContainer);
     panel_container->AddObserver(watcher_);
 
-    aura::Window* container = Launcher::ForWindow(root)->window_container();
+    aura::Window* container =
+        Launcher::ForWindow(root)->shelf_widget()->window_container();
     container->AddObserver(this);
     for (size_t i = 0; i < container->children().size(); ++i)
       container->children()[i]->AddObserver(watcher_);
@@ -51,7 +53,8 @@ class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
         internal::kShellWindowId_PanelContainer);
     panel_container->RemoveObserver(watcher_);
 
-    aura::Window* container = Launcher::ForWindow(root)->window_container();
+    aura::Window* container =
+        Launcher::ForWindow(root)->shelf_widget()->window_container();
     container->RemoveObserver(this);
     for (size_t i = 0; i < container->children().size(); ++i)
       container->children()[i]->RemoveObserver(watcher_);