| Index: ash/wm/panels/panel_layout_manager.cc
|
| diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc
|
| index 95db2579663de31a3b66a63e6778f8b6b7496015..9266f94bb1cff1be678a2133d81299322debe184 100644
|
| --- a/ash/wm/panels/panel_layout_manager.cc
|
| +++ b/ash/wm/panels/panel_layout_manager.cc
|
| @@ -37,9 +37,8 @@
|
| #include "ui/wm/public/activation_client.h"
|
|
|
| namespace ash {
|
| -namespace internal {
|
| -
|
| namespace {
|
| +
|
| const int kPanelIdealSpacing = 4;
|
|
|
| const float kMaxHeightFactor = .80f;
|
| @@ -310,7 +309,7 @@ void PanelLayoutManager::SetShelf(Shelf* shelf) {
|
| shelf_ = shelf;
|
| shelf_->AddIconObserver(this);
|
| if (shelf_->shelf_widget()) {
|
| - shelf_layout_manager_ = ash::internal::ShelfLayoutManager::ForShelf(
|
| + shelf_layout_manager_ = ash::ShelfLayoutManager::ForShelf(
|
| shelf_->shelf_widget()->GetNativeWindow());
|
| WillChangeVisibilityState(shelf_layout_manager_->visibility_state());
|
| shelf_layout_manager_->AddObserver(this);
|
| @@ -885,5 +884,4 @@ void PanelLayoutManager::OnKeyboardBoundsChanging(
|
| OnWindowResized();
|
| }
|
|
|
| -} // namespace internal
|
| } // namespace ash
|
|
|