mash: Move ShelfWindowWatcher[ItemDelegate] to ash/common.

ash/shell.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.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 38 matching lines @@
 #include "ash/first_run/first_run_helper_impl.h"
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/ime/input_method_event_handler.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/shelf_window_watcher.h"
 #include "ash/shell_init_params.h"
 #include "ash/utility/screenshot_controller.h"
 #include "ash/wm/ash_focus_rules.h"
 #include "ash/wm/ash_native_cursor_manager.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/overlay_event_filter.h"
 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/resize_shadow_controller.h"
@@ skipping 291 matching lines @@
   FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(),
                     OnRootWindowAdded(root_window));
 }
 
 void Shell::CreateShelf() {
   // Must occur after SessionStateDelegate creation and user login.
   DCHECK(session_state_delegate_);
   DCHECK_GT(session_state_delegate_->NumberOfLoggedInUsers(), 0);
   wm_shell_->CreateShelfDelegate();
 
-  // TODO(jamescook): This is here for historical reasons. Move it to WmShell.
-  // http://crbug.com/629257
-  if (!shelf_window_watcher_) {
-    shelf_window_watcher_.reset(
-        new ShelfWindowWatcher(wm_shell_->shelf_model()));
-  }
-
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
     (*iter)->CreateShelf();
 }
 
 void Shell::OnShelfCreatedForRootWindow(WmWindow* root_window) {
   FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(),
                     OnShelfCreatedForRootWindow(root_window));
 }
@@ skipping 250 matching lines @@
   video_detector_.reset();
   high_contrast_controller_.reset();
 
   shadow_controller_.reset();
   resize_shadow_controller_.reset();
 
   // Has to happen before ~MruWindowTracker.
   wm_shell_->DeleteWindowCycleController();
   wm_shell_->DeleteWindowSelectorController();
 
-  // |shelf_window_watcher_| has a weak pointer to the shelf model and has
-  // window observers.
-  shelf_window_watcher_.reset();
-
   // Destroy all child windows including widgets.
   window_tree_host_manager_->CloseChildWindows();
   // MruWindowTracker must be destroyed after all windows have been deleted to
   // avoid a possible crash when Shell is destroyed from a non-normal shutdown
   // path. (crbug.com/485438).
   wm_shell_->DeleteMruWindowTracker();
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
   // Alphabetical. TODO(oshima): sort.
@@ skipping 409 matching lines @@
 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
   return std::unique_ptr<ui::EventTargetIterator>();
 }
 
 ui::EventTargeter* Shell::GetEventTargeter() {
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace ash