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

Unified Diff: ash/mus/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/layout_manager.h ('k') | ash/mus/layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/layout_manager.cc
diff --git a/ash/mus/layout_manager.cc b/ash/mus/layout_manager.cc
index 5aab86baa18f015551ea4d66b69e2ee0185e68f9..6652a8380b4707d3a8a74e801e0873efd9829987 100644
--- a/ash/mus/layout_manager.cc
+++ b/ash/mus/layout_manager.cc
@@ -17,7 +17,7 @@ LayoutManager::~LayoutManager() {
Uninstall();
}
-LayoutManager::LayoutManager(::ui::Window* owner) : owner_(owner) {
+LayoutManager::LayoutManager(ui::Window* owner) : owner_(owner) {
owner_->AddObserver(this);
DCHECK(owner->children().empty());
}
@@ -32,7 +32,7 @@ void LayoutManager::Uninstall() {
}
void LayoutManager::OnTreeChanged(
- const ::ui::WindowObserver::TreeChangeParams& params) {
+ const ui::WindowObserver::TreeChangeParams& params) {
DCHECK(params.target);
if (params.new_parent == owner_) {
// params.target was added to the layout.
@@ -46,12 +46,12 @@ void LayoutManager::OnTreeChanged(
}
}
-void LayoutManager::OnWindowDestroying(::ui::Window* window) {
+void LayoutManager::OnWindowDestroying(ui::Window* window) {
if (owner_ == window)
Uninstall();
}
-void LayoutManager::OnWindowBoundsChanged(::ui::Window* window,
+void LayoutManager::OnWindowBoundsChanged(ui::Window* window,
const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) {
if (window != owner_)
@@ -63,7 +63,7 @@ void LayoutManager::OnWindowBoundsChanged(::ui::Window* window,
}
void LayoutManager::OnWindowSharedPropertyChanged(
- ::ui::Window* window,
+ ui::Window* window,
const std::string& name,
const std::vector<uint8_t>* old_data,
const std::vector<uint8_t>* new_data) {
@@ -75,8 +75,8 @@ void LayoutManager::OnWindowSharedPropertyChanged(
LayoutWindow(window);
}
-void LayoutManager::WindowAdded(::ui::Window* window) {}
-void LayoutManager::WindowRemoved(::ui::Window* window) {}
+void LayoutManager::WindowAdded(ui::Window* window) {}
+void LayoutManager::WindowRemoved(ui::Window* window) {}
void LayoutManager::AddLayoutProperty(const std::string& name) {
layout_properties_.insert(name);
« no previous file with comments | « ash/mus/layout_manager.h ('k') | ash/mus/layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698