diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 16:16:08 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 16:16:08 +0000 |
| commit | 0419d72dd1add69e3e7803d4664cfe36ca04ff04 (patch) | |
| tree | 3fb752b1851969d4f9795abc90e8d29c967b5ab4 /ash/test/test_launcher_delegate.cc | |
| parent | 0644617c01ef53d35dbf3d36678863c3a5c6341d (diff) | |
| download | chromium_src-0419d72dd1add69e3e7803d4664cfe36ca04ff04.zip chromium_src-0419d72dd1add69e3e7803d4664cfe36ca04ff04.tar.gz chromium_src-0419d72dd1add69e3e7803d4664cfe36ca04ff04.tar.bz2 | |
Minor Ash panel related cleanup
A little code cleanup I did while debugging some panel focus issues.
BUG=none
Review URL: https://codereview.chromium.org/12442009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/test_launcher_delegate.cc')
| -rw-r--r-- | ash/test/test_launcher_delegate.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc index d9ea76b..cc86459 100644 --- a/ash/test/test_launcher_delegate.cc +++ b/ash/test/test_launcher_delegate.cc @@ -69,7 +69,8 @@ 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); } |