diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 15:53:39 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 15:53:39 +0000 |
| commit | c967ec0e09ccf24b4d492fada0db706be459a081 (patch) | |
| tree | eeeaeeb87500984c630ad1e8b351025d9a6ab411 /ash/launcher/launcher.cc | |
| parent | 325a2027024bec2b967a9572d3136145a766c71c (diff) | |
| download | chromium_src-c967ec0e09ccf24b4d492fada0db706be459a081.zip chromium_src-c967ec0e09ccf24b4d492fada0db706be459a081.tar.gz chromium_src-c967ec0e09ccf24b4d492fada0db706be459a081.tar.bz2 | |
Reland 187876 - Reorder panels in the launcher when dragging the panel window.
BUG=172254
TEST=PanelWindowResizerTest.DragReordersPanels*
Review URL: https://chromiumcodereview.appspot.com/12434007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/launcher.cc')
| -rw-r--r-- | ash/launcher/launcher.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc index 54c8e0c..51f68c1 100644 --- a/ash/launcher/launcher.cc +++ b/ash/launcher/launcher.cc @@ -48,7 +48,7 @@ Launcher::Launcher(LauncherModel* launcher_model, LauncherDelegate* launcher_delegate, ShelfWidget* shelf_widget) : launcher_view_(NULL), - alignment_(SHELF_ALIGNMENT_BOTTOM), + alignment_(shelf_widget->GetAlignment()), delegate_(launcher_delegate), shelf_widget_(shelf_widget) { launcher_view_ = new internal::LauncherView( @@ -95,6 +95,12 @@ gfx::Rect Launcher::GetScreenBoundsOfItemIconForWindow(aura::Window* window) { bounds.height()); } +void Launcher::UpdateIconPositionForWindow(aura::Window* window) { + launcher_view_->UpdatePanelIconPosition( + delegate_->GetIDByWindow(window), + window->bounds().CenterPoint()); +} + void Launcher::ActivateLauncherItem(int index) { const ash::LauncherItems& items = launcher_view_->model()->items(); |