diff options
| author | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-04 03:57:50 +0000 |
|---|---|---|
| committer | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-04 03:57:50 +0000 |
| commit | 6de3a01154a0ffbe273da08ce6c67164d71b18d7 (patch) | |
| tree | 88d226f502c045295e98df3137d92e3e07ed931f /ash/shell.cc | |
| parent | eb8abacb3842302263f3d3bd6f875d25273eb991 (diff) | |
| download | chromium_src-6de3a01154a0ffbe273da08ce6c67164d71b18d7.zip chromium_src-6de3a01154a0ffbe273da08ce6c67164d71b18d7.tar.gz chromium_src-6de3a01154a0ffbe273da08ce6c67164d71b18d7.tar.bz2 | |
Revert 120460 - Add PanelWindow and PanelLayoutManager to ash.
This implements a sample implementation of a WidgetDelegateView (PanelWindow) and a LayoutManager to provide an initial outline for developing panels.
ash_shell must be run with --aura-panels to get the new behavior, since Chrome currently relies on existing behavior for widgets of TYPE_PANEL.
BUG=98330
TEST=Run ash_shell --aura-panels to see a simple panel test implementation. Ensure panels work as expected in Chrome.
Review URL: http://codereview.chromium.org/9104027
TBR=stevenjb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9328026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index b1203bc..1b06566 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -22,7 +22,6 @@ #include "ash/wm/compact_layout_manager.h" #include "ash/wm/compact_status_area_layout_manager.h" #include "ash/wm/dialog_frame_view.h" -#include "ash/wm/panel_layout_manager.h" #include "ash/wm/power_button_controller.h" #include "ash/wm/root_window_event_filter.h" #include "ash/wm/root_window_layout_manager.h" @@ -96,13 +95,6 @@ void CreateSpecialContainers(aura::Window::Windows* containers) { aura::Window* panel_container = new aura::Window(NULL); panel_container->set_id(internal::kShellWindowId_PanelContainer); - if (CommandLine::ForCurrentProcess()-> - HasSwitch(switches::kAuraPanelManager)) { - panel_container->SetEventFilter( - new ToplevelWindowEventFilter(panel_container)); - panel_container->SetLayoutManager( - new internal::PanelLayoutManager(panel_container)); - } containers->push_back(panel_container); aura::Window* launcher_container = new aura::Window(NULL); |