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

Unified Diff: ash/mus/window_manager_application.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/window_manager_application.h ('k') | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index b7af295870611a8005447d1d4aff22e932134e28..247c760e19e09bed0e2b63c1097eeca068a2eead 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -88,7 +88,7 @@ void WindowManagerApplication::OnAcceleratorRegistrarDestroyed(
}
void WindowManagerApplication::InitWindowManager(
- ::ui::WindowTreeClient* window_tree_client) {
+ ui::WindowTreeClient* window_tree_client) {
InitializeComponents();
window_manager_->Init(window_tree_client);
@@ -96,7 +96,7 @@ void WindowManagerApplication::InitWindowManager(
}
void WindowManagerApplication::OnStart(const shell::Identity& identity) {
- ::ui::GpuService::Initialize(connector());
+ ui::GpuService::Initialize(connector());
window_manager_.reset(new WindowManager(connector()));
aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak"));
@@ -104,7 +104,7 @@ void WindowManagerApplication::OnStart(const shell::Identity& identity) {
tracing_.Initialize(connector(), identity.name());
- ::ui::WindowTreeClient* window_tree_client = new ::ui::WindowTreeClient(
+ ui::WindowTreeClient* window_tree_client = new ui::WindowTreeClient(
window_manager_.get(), window_manager_.get(), nullptr);
window_tree_client->ConnectAsWindowManager(connector());
@@ -114,7 +114,7 @@ void WindowManagerApplication::OnStart(const shell::Identity& identity) {
bool WindowManagerApplication::OnConnect(shell::Connection* connection) {
connection->AddInterface<mojom::ShelfLayout>(this);
connection->AddInterface<mojom::UserWindowController>(this);
- connection->AddInterface<::ui::mojom::AcceleratorRegistrar>(this);
+ connection->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
if (connection->GetRemoteIdentity().name() == "mojo:mash_session") {
connection->GetInterface(&session_);
session_->AddScreenlockStateListener(
@@ -147,7 +147,7 @@ void WindowManagerApplication::Create(
void WindowManagerApplication::Create(
const shell::Identity& remote_identity,
- mojo::InterfaceRequest<::ui::mojom::AcceleratorRegistrar> request) {
+ mojo::InterfaceRequest<ui::mojom::AcceleratorRegistrar> request) {
if (!window_manager_->window_manager_client())
return; // Can happen during shutdown.
« no previous file with comments | « ash/mus/window_manager_application.h ('k') | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698