| Index: ash/mus/shelf_layout_manager.cc
|
| diff --git a/ash/mus/shelf_layout_manager.cc b/ash/mus/shelf_layout_manager.cc
|
| index 1a5dc6085d607faec8d14a8a0c21af7b4166f02b..030283658900a0fc1fbb772219bd1c2d32fea495 100644
|
| --- a/ash/mus/shelf_layout_manager.cc
|
| +++ b/ash/mus/shelf_layout_manager.cc
|
| @@ -13,19 +13,19 @@
|
| namespace ash {
|
| namespace mus {
|
|
|
| -ShelfLayoutManager::ShelfLayoutManager(::ui::Window* owner,
|
| +ShelfLayoutManager::ShelfLayoutManager(ui::Window* owner,
|
| ShelfLayoutManagerDelegate* delegate)
|
| : LayoutManager(owner),
|
| delegate_(delegate),
|
| alignment_(mash::shelf::mojom::Alignment::BOTTOM),
|
| auto_hide_behavior_(mash::shelf::mojom::AutoHideBehavior::NEVER) {
|
| - AddLayoutProperty(::ui::mojom::WindowManager::kPreferredSize_Property);
|
| + AddLayoutProperty(ui::mojom::WindowManager::kPreferredSize_Property);
|
| }
|
|
|
| ShelfLayoutManager::~ShelfLayoutManager() {}
|
|
|
| -::ui::Window* ShelfLayoutManager::GetShelfWindow() {
|
| - for (::ui::Window* child : owner()->children()) {
|
| +ui::Window* ShelfLayoutManager::GetShelfWindow() {
|
| + for (ui::Window* child : owner()->children()) {
|
| if (GetAshWindowType(child) == mojom::AshWindowType::SHELF)
|
| return child;
|
| }
|
| @@ -37,7 +37,7 @@ void ShelfLayoutManager::SetAlignment(mash::shelf::mojom::Alignment alignment) {
|
| return;
|
|
|
| alignment_ = alignment;
|
| - for (::ui::Window* window : owner()->children())
|
| + for (ui::Window* window : owner()->children())
|
| LayoutWindow(window);
|
| }
|
|
|
| @@ -54,7 +54,7 @@ void ShelfLayoutManager::SetAutoHideBehavior(
|
| // layout as the number of children can vary when the application providing the
|
| // shelf restarts.
|
|
|
| -void ShelfLayoutManager::LayoutWindow(::ui::Window* window) {
|
| +void ShelfLayoutManager::LayoutWindow(ui::Window* window) {
|
| if (GetAshWindowType(window) != mojom::AshWindowType::SHELF) {
|
| // Phantom windows end up in this container, ignore them.
|
| return;
|
| @@ -74,7 +74,7 @@ void ShelfLayoutManager::LayoutWindow(::ui::Window* window) {
|
| }
|
| }
|
|
|
| -void ShelfLayoutManager::WindowAdded(::ui::Window* window) {
|
| +void ShelfLayoutManager::WindowAdded(ui::Window* window) {
|
| if (GetAshWindowType(window) == mojom::AshWindowType::SHELF)
|
| delegate_->OnShelfWindowAvailable();
|
| }
|
|
|