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

Unified Diff: ash/mus/bridge/wm_shell_mus.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/bridge/wm_shell_mus.h ('k') | ash/mus/bridge/wm_window_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index 4e64d2d37fca75096c94ca25c3036911a75896ac..71841de86ca989d879056fb0b7ff59243c90c514 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -166,7 +166,7 @@ void WmShellMus::RemoveRootWindowController(
}
// static
-WmWindowMus* WmShellMus::GetToplevelAncestor(::ui::Window* window) {
+WmWindowMus* WmShellMus::GetToplevelAncestor(ui::Window* window) {
while (window) {
if (IsActivationParent(window->parent()))
return WmWindowMus::Get(window);
@@ -339,19 +339,19 @@ void WmShellMus::ToggleIgnoreExternalKeyboard() {
}
#endif // defined(OS_CHROMEOS)
-::ui::WindowTreeClient* WmShellMus::window_tree_client() {
+ui::WindowTreeClient* WmShellMus::window_tree_client() {
return window_manager_->window_tree_client();
}
// static
-bool WmShellMus::IsActivationParent(::ui::Window* window) {
+bool WmShellMus::IsActivationParent(ui::Window* window) {
return window && IsActivatableShellWindowId(
WmWindowMus::Get(window)->GetShellWindowId());
}
// TODO: support OnAttemptToReactivateWindow, http://crbug.com/615114.
-void WmShellMus::OnWindowTreeFocusChanged(::ui::Window* gained_focus,
- ::ui::Window* lost_focus) {
+void WmShellMus::OnWindowTreeFocusChanged(ui::Window* gained_focus,
+ ui::Window* lost_focus) {
WmWindowMus* gained_active = GetToplevelAncestor(gained_focus);
WmWindowMus* lost_active = GetToplevelAncestor(gained_focus);
if (gained_active == lost_active)
@@ -361,7 +361,7 @@ void WmShellMus::OnWindowTreeFocusChanged(::ui::Window* gained_focus,
OnWindowActivated(gained_active, lost_active));
}
-void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) {
+void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
DCHECK_EQ(window_tree_client(), client);
client->RemoveObserver(this);
}
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/mus/bridge/wm_window_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698