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/wm/panel_layout_manager.h | |
| 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/wm/panel_layout_manager.h')
| -rw-r--r-- | ash/wm/panel_layout_manager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/wm/panel_layout_manager.h b/ash/wm/panel_layout_manager.h index 9b22e06..9c94fef 100644 --- a/ash/wm/panel_layout_manager.h +++ b/ash/wm/panel_layout_manager.h @@ -60,6 +60,7 @@ class ASH_EXPORT PanelLayoutManager void ToggleMinimize(aura::Window* panel); + ash::Launcher* launcher() { return launcher_; } void SetLauncher(ash::Launcher* launcher); // Overridden from aura::LayoutManager: @@ -88,6 +89,7 @@ class ASH_EXPORT PanelLayoutManager private: friend class PanelLayoutManagerTest; + friend class PanelWindowResizerTest; typedef std::list<aura::Window*> PanelList; |