diff options
| author | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-21 00:57:02 +0000 |
|---|---|---|
| committer | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-21 00:57:02 +0000 |
| commit | 7eaa3c1037aeaf6ae34b916960d7ece124d5761c (patch) | |
| tree | 743173b847827321e9c08402e24d6c6971a85117 /ash/shell | |
| parent | 93ef2562762be7b8185211d4d59105b692cf34c9 (diff) | |
| download | chromium_src-7eaa3c1037aeaf6ae34b916960d7ece124d5761c.zip chromium_src-7eaa3c1037aeaf6ae34b916960d7ece124d5761c.tar.gz chromium_src-7eaa3c1037aeaf6ae34b916960d7ece124d5761c.tar.bz2 | |
Revert 133309 - Draw panels above their launcher icons.
(Caused test failures on Win and CrOS:PanelLayoutManagerTest.AddOnePanel)
Note that this patch doesn't handle dragging panels to rearrange them (if we want that at all) and panels with no launcher icon because they are in overflow.
BUG=124115
TEST=aura_shell_unittests --gtest_filter=*Panel* --aura-panels
Review URL: https://chromiumcodereview.appspot.com/10091017
TBR=dcheng@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10134018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/window_watcher.cc | 9 | ||||
| -rw-r--r-- | ash/shell/window_watcher.h | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index 5398a8a..ec14e1b 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc @@ -7,18 +7,14 @@ #include "ash/launcher/launcher.h" #include "ash/launcher/launcher_model.h" #include "ash/shell.h" -#include "ash/shell_window_ids.h" #include "ui/aura/window.h" namespace ash { namespace shell { WindowWatcher::WindowWatcher() - : window_(ash::Shell::GetInstance()->launcher()->window_container()), - panel_container_(ash::Shell::GetInstance()->GetContainer( - ash::internal::kShellWindowId_PanelContainer)) { + : window_(ash::Shell::GetInstance()->launcher()->window_container()) { window_->AddObserver(this); - panel_container_->AddObserver(this); } WindowWatcher::~WindowWatcher() { @@ -41,8 +37,7 @@ ash::LauncherID WindowWatcher::GetIDByWindow(aura::Window* window) const { // aura::WindowObserver overrides: void WindowWatcher::OnWindowAdded(aura::Window* new_window) { - if (new_window->type() != aura::client::WINDOW_TYPE_NORMAL && - new_window->type() != aura::client::WINDOW_TYPE_PANEL) + if (new_window->type() != aura::client::WINDOW_TYPE_NORMAL) return; static int image_count = 0; diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h index f31fb07..d36a4c8 100644 --- a/ash/shell/window_watcher.h +++ b/ash/shell/window_watcher.h @@ -40,8 +40,6 @@ class WindowWatcher : public aura::WindowObserver { // Window watching for newly created windows to be added to. aura::Window* window_; - aura::Window* panel_container_; - // Maps from window to the id we gave it. IDToWindow id_to_window_; |