diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 14:22:32 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 14:22:32 +0000 |
| commit | 9557994173596c120fcf399062c605648a9c1dee (patch) | |
| tree | bdbe5c474950229e5f03c2391180bdcfa652a1e5 /ash/root_window_controller.cc | |
| parent | bbdaed3eb825b3dca34c6101c58fb8a1c0c84e55 (diff) | |
| download | chromium_src-9557994173596c120fcf399062c605648a9c1dee.zip chromium_src-9557994173596c120fcf399062c605648a9c1dee.tar.gz chromium_src-9557994173596c120fcf399062c605648a9c1dee.tar.bz2 | |
broke compilation on win_aura: exported class using non-exported interface
Revert 212306 "Dock with non-zero width"
> Dock with non-zero width
>
> BUG=233337
> BUG=247085
>
> This CL builds on https://codereview.chromium.org/13896026/ and adds a non-zero width dock. It is possible to add windows to the dock and it will update its width (insetting the workspace).
>
> Review URL: https://chromiumcodereview.appspot.com/15719012
TBR=varkha@chromium.org
Review URL: https://codereview.chromium.org/19592007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 7039d56..3e46f50 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -302,11 +302,8 @@ void RootWindowController::ShowLauncher() { void RootWindowController::OnLauncherCreated() { if (panel_layout_manager_) panel_layout_manager_->SetLauncher(shelf_->launcher()); - if (docked_layout_manager_) { + if (docked_layout_manager_) docked_layout_manager_->SetLauncher(shelf_->launcher()); - if (shelf_->shelf_layout_manager()) - docked_layout_manager_->AddObserver(shelf_->shelf_layout_manager()); - } } void RootWindowController::UpdateAfterLoginStatusChange( @@ -356,13 +353,6 @@ void RootWindowController::CloseChildWindows() { panel_layout_manager_->Shutdown(); panel_layout_manager_ = NULL; } - // docked_layout_manager_ needs to be shut down before windows are destroyed. - if (docked_layout_manager_) { - if (shelf_->shelf_layout_manager()) - docked_layout_manager_->RemoveObserver(shelf_->shelf_layout_manager()); - docked_layout_manager_->Shutdown(); - docked_layout_manager_ = NULL; - } // TODO(harrym): Remove when Status Area Widget is a child view. shelf_->ShutdownStatusAreaWidget(); |