Minor Ash panel related cleanup

ash/shell/launcher_delegate_impl.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/launcher_delegate_impl.h"
 
 #include "ash/launcher/launcher_util.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/shell/window_watcher.h"
 #include "ash/wm/window_util.h"
@@ skipping 14 matching lines @@
 void LauncherDelegateImpl::OnBrowserShortcutClicked(int event_flags) {
   ash::shell::ToplevelWindow::CreateParams create_params;
   create_params.can_resize = true;
   create_params.can_maximize = true;
   ash::shell::ToplevelWindow::CreateToplevelWindow(create_params);
 }
 
 void LauncherDelegateImpl::ItemClicked(const ash::LauncherItem& item,
                                        const ui::Event& event) {
   aura::Window* window = watcher_->GetWindowByID(item.id);
-  ash::launcher::MoveToEventRootIfPanel(window, event);
+  if (window->type() == aura::client::WINDOW_TYPE_PANEL)
+    ash::wm::MoveWindowToEventRoot(window, event);
   window->Show();
   ash::wm::ActivateWindow(window);
 }
 
 int LauncherDelegateImpl::GetBrowserShortcutResourceId() {
   return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT;
 }
 
 string16 LauncherDelegateImpl::GetTitle(const ash::LauncherItem& item) {
   return watcher_->GetWindowByID(item.id)->title();
@@ skipping 24 matching lines @@
 }
 
 void LauncherDelegateImpl::OnLauncherCreated(Launcher* launcher) {
 }
 
 void LauncherDelegateImpl::OnLauncherDestroyed(Launcher* launcher) {
 }
 
 }  // namespace shell
 }  // namespace ash