| Index: ash/shell/window_watcher.cc
|
| diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
|
| index 075d4a3cc369c03d50ff9b748f5cf69b350a9327..55231cf7a0608148a22974e4fc43f7f635f64e4a 100644
|
| --- a/ash/shell/window_watcher.cc
|
| +++ b/ash/shell/window_watcher.cc
|
| @@ -38,9 +38,8 @@ class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
|
| }
|
|
|
| void RootWindowAdded(aura::Window* root) {
|
| - aura::Window* panel_container = ash::Shell::GetContainer(
|
| - root,
|
| - internal::kShellWindowId_PanelContainer);
|
| + aura::Window* panel_container =
|
| + ash::Shell::GetContainer(root, kShellWindowId_PanelContainer);
|
| panel_container->AddObserver(watcher_);
|
|
|
| aura::Window* container =
|
| @@ -51,9 +50,8 @@ class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
|
| }
|
|
|
| void RootWindowRemoved(aura::Window* root) {
|
| - aura::Window* panel_container = ash::Shell::GetContainer(
|
| - root,
|
| - internal::kShellWindowId_PanelContainer);
|
| + aura::Window* panel_container =
|
| + ash::Shell::GetContainer(root, kShellWindowId_PanelContainer);
|
| panel_container->RemoveObserver(watcher_);
|
|
|
| aura::Window* container =
|
|
|