diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 15:19:04 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 15:19:04 +0000 |
| commit | 582022050957ad3a4ec42eaab9f20177ec13e9e2 (patch) | |
| tree | 555f4f6e685f13633c9c477bbc8fad0f5441be50 /ash/root_window_controller.cc | |
| parent | cd5664d9be154b4f051c47688803918a1a37d207 (diff) | |
| download | chromium_src-582022050957ad3a4ec42eaab9f20177ec13e9e2.zip chromium_src-582022050957ad3a4ec42eaab9f20177ec13e9e2.tar.gz chromium_src-582022050957ad3a4ec42eaab9f20177ec13e9e2.tar.bz2 | |
Allow detaching and reattaching panels when dragged from/to launcher.
BUG=160646
TEST=PanelWindowResizerTest.PanelDetachReattach
Review URL: https://chromiumcodereview.appspot.com/12281005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 19132d0..71c9101 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -22,7 +22,6 @@ #include "ash/wm/base_layout_manager.h" #include "ash/wm/boot_splash_screen.h" #include "ash/wm/panel_layout_manager.h" -#include "ash/wm/panel_window_event_filter.h" #include "ash/wm/property_util.h" #include "ash/wm/root_window_layout_manager.h" #include "ash/wm/screen_dimmer.h" @@ -305,9 +304,8 @@ void RootWindowController::InitForPrimaryDisplay() { internal::kShellWindowId_PanelContainer); panel_layout_manager_ = new internal::PanelLayoutManager(panel_container); - panel_container->AddPreTargetHandler( - new internal::PanelWindowEventFilter( - panel_container, panel_layout_manager_)); + panel_container_handler_.reset( + new ToplevelWindowEventHandler(panel_container)); panel_container->SetLayoutManager(panel_layout_manager_); } |