Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: ash/launcher/launcher_util.cc

Issue 12442009: Minor Ash panel related cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/launcher/launcher_util.h ('k') | ash/shell/launcher_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_util.cc
diff --git a/ash/launcher/launcher_util.cc b/ash/launcher/launcher_util.cc
index f41ac7dce2932ad183cc3c89e6783e73950b0ddc..f7ba77f0bfc2f54263a3c9d571358d5e9de95528 100644
--- a/ash/launcher/launcher_util.cc
+++ b/ash/launcher/launcher_util.cc
@@ -6,11 +6,6 @@
#include "ash/launcher/launcher_model.h"
#include "ash/launcher/launcher_types.h"
-#include "ash/shell.h"
-#include "ui/aura/client/window_types.h"
-#include "ui/aura/window.h"
-#include "ui/views/view.h"
-#include "ui/views/widget/widget.h"
namespace ash {
namespace launcher {
@@ -23,20 +18,5 @@ int GetBrowserItemIndex(const LauncherModel& launcher_model) {
return -1;
}
-void MoveToEventRootIfPanel(aura::Window* maybe_panel,
- const ui::Event& event) {
- if (maybe_panel->type() != aura::client::WINDOW_TYPE_PANEL)
- return;
- views::View* target = static_cast<views::View*>(event.target());
- aura::RootWindow* target_root =
- target ? target->GetWidget()->GetNativeView()->GetRootWindow() : NULL;
- if (target_root && target_root != maybe_panel->GetRootWindow()) {
- aura::Window* panel_container =
- ash::Shell::GetContainer(target_root, maybe_panel->parent()->id());
- // Move the panel to the target launcher.
- panel_container->AddChild(maybe_panel);
- }
-}
-
} // namespace launcher
} // namespace ash
« no previous file with comments | « ash/launcher/launcher_util.h ('k') | ash/shell/launcher_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698