Minor Ash panel related cleanup

ash/test/test_launcher_delegate.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/test/test_launcher_delegate.h"
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_util.h"
 #include "ash/wm/window_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 51 matching lines @@
     observed_windows_.erase(it);
   }
 }
 
 void TestLauncherDelegate::OnBrowserShortcutClicked(int event_flags) {
 }
 
 void TestLauncherDelegate::ItemClicked(const ash::LauncherItem& item,
                                        const ui::Event& event) {
   aura::Window* window = GetWindowByID(item.id);
-  launcher::MoveToEventRootIfPanel(window, event);
+  if (window->type() == aura::client::WINDOW_TYPE_PANEL)
+    ash::wm::MoveWindowToEventRoot(window, event);
   window->Show();
   ash::wm::ActivateWindow(window);
 }
 
 int TestLauncherDelegate::GetBrowserShortcutResourceId() {
   return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT;
 }
 
 string16 TestLauncherDelegate::GetTitle(const ash::LauncherItem& item) {
   aura::Window* window = GetWindowByID(item.id);
@@ skipping 38 matching lines @@
 }
 
 void TestLauncherDelegate::OnLauncherCreated(Launcher* launcher) {
 }
 
 void TestLauncherDelegate::OnLauncherDestroyed(Launcher* launcher) {
 }
 
 }  // namespace test
 }  // namespace ash