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

Unified Diff: ash/shell/launcher_delegate_impl.cc

Issue 12093075: Move the panel to the root window where the mouse click occurred. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated comment Created 7 years, 11 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/shell/launcher_delegate_impl.h ('k') | ash/test/test_launcher_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/launcher_delegate_impl.cc
diff --git a/ash/shell/launcher_delegate_impl.cc b/ash/shell/launcher_delegate_impl.cc
index 60616f49f24317fd9c3b92a9780d9c10ffe8c4dd..063881e36be8185bc6e5b4ac20da85c934f3b6ef 100644
--- a/ash/shell/launcher_delegate_impl.cc
+++ b/ash/shell/launcher_delegate_impl.cc
@@ -4,6 +4,7 @@
#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"
@@ -29,8 +30,9 @@ void LauncherDelegateImpl::OnBrowserShortcutClicked(int event_flags) {
}
void LauncherDelegateImpl::ItemClicked(const ash::LauncherItem& item,
- int event_flags) {
+ const ui::Event& event) {
aura::Window* window = watcher_->GetWindowByID(item.id);
+ ash::launcher::MoveToEventRootIfPanel(window, event);
window->Show();
ash::wm::ActivateWindow(window);
}
« no previous file with comments | « ash/shell/launcher_delegate_impl.h ('k') | ash/test/test_launcher_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698