Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2599)

Unified Diff: ash/mus/shelf_layout_manager.cc

Issue 2182633011: Replaces ::ui:: with ui:: in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/shelf_layout_manager.h ('k') | ash/mus/status_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « ash/mus/shelf_layout_manager.h ('k') | ash/mus/status_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698