Refactor: Shelf Widget

ash/shell/window_watcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell/window_watcher.h"
 
 #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"
 #include "ui/aura/window.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 namespace shell {
 
 class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
@@ skipping 12 matching lines @@
     DCHECK(window->children().empty());
     window->RemoveObserver(watcher_);
   }
 
   void RootWindowAdded(aura::RootWindow* root) {
     aura::Window* panel_container = ash::Shell::GetContainer(
         root,
         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_);
   }
 
   void RootWindowRemoved(aura::RootWindow* root) {
     aura::Window* panel_container = ash::Shell::GetContainer(
         root,
         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_);
   }
 
  private:
   WindowWatcher* watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowWatcher);
 };
@@ skipping 79 matching lines @@
   workspace_window_watcher_->RootWindowAdded(root);
 }
 
 void WindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) {
   // All windows in the display has already been removed, so no need to
   // remove observers.
 }
 
 }  // namespace shell
 }  // namespace ash