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

Unified Diff: ash/mus/root_window_controller.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/root_window_controller.h ('k') | ash/mus/screenlock_layout.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/root_window_controller.cc
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index f00b8655784b8a689fa9797a05993050e7755a92..e864585dc18178120af653b0ea88066b925c6f02 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -78,7 +78,7 @@ class WorkspaceLayoutManagerDelegateImpl
} // namespace
RootWindowController::RootWindowController(WindowManager* window_manager,
- ::ui::Window* root,
+ ui::Window* root,
const display::Display& display)
: window_manager_(window_manager),
root_(root),
@@ -116,20 +116,20 @@ shell::Connector* RootWindowController::GetConnector() {
return window_manager_->connector();
}
-::ui::Window* RootWindowController::NewTopLevelWindow(
+ui::Window* RootWindowController::NewTopLevelWindow(
std::map<std::string, std::vector<uint8_t>>* properties) {
// TODO(sky): panels need a different frame, http:://crbug.com/614362.
const bool provide_non_client_frame =
- GetWindowType(*properties) == ::ui::mojom::WindowType::WINDOW ||
- GetWindowType(*properties) == ::ui::mojom::WindowType::PANEL;
+ GetWindowType(*properties) == ui::mojom::WindowType::WINDOW ||
+ GetWindowType(*properties) == ui::mojom::WindowType::PANEL;
if (provide_non_client_frame)
- (*properties)[::ui::mojom::kWaitForUnderlay_Property].clear();
+ (*properties)[ui::mojom::kWaitForUnderlay_Property].clear();
// TODO(sky): constrain and validate properties before passing to server.
- ::ui::Window* window = root_->window_tree()->NewWindow(properties);
+ ui::Window* window = root_->window_tree()->NewWindow(properties);
window->SetBounds(CalculateDefaultBounds(window));
- ::ui::Window* container_window = nullptr;
+ ui::Window* container_window = nullptr;
mojom::Container container;
if (GetRequestedContainer(window, &container)) {
container_window = GetWindowForContainer(container);
@@ -152,7 +152,7 @@ shell::Connector* RootWindowController::GetConnector() {
return window;
}
-::ui::Window* RootWindowController::GetWindowForContainer(Container container) {
+ui::Window* RootWindowController::GetWindowForContainer(Container container) {
WmWindowMus* wm_window =
GetWindowByShellWindowId(MashContainerToAshShellWindowId(container));
DCHECK(wm_window);
@@ -176,11 +176,11 @@ StatusLayoutManager* RootWindowController::GetStatusLayoutManager() {
}
gfx::Rect RootWindowController::CalculateDefaultBounds(
- ::ui::Window* window) const {
+ ui::Window* window) const {
if (window->HasSharedProperty(
- ::ui::mojom::WindowManager::kInitialBounds_Property)) {
+ ui::mojom::WindowManager::kInitialBounds_Property)) {
return window->GetSharedProperty<gfx::Rect>(
- ::ui::mojom::WindowManager::kInitialBounds_Property);
+ ui::mojom::WindowManager::kInitialBounds_Property);
}
if (GetWindowShowState(window) == ui::mojom::ShowState::FULLSCREEN) {
« no previous file with comments | « ash/mus/root_window_controller.h ('k') | ash/mus/screenlock_layout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698