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

Unified Diff: ash/mus/bridge/wm_shell_mus.h

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_root_window_controller_mus.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index e9daf0636bfb3072cd9613a396c07bc1e4846dd6..890fe82a99b47d4d61ddfa039fc8283da3d41c87 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -33,7 +33,7 @@ class WmRootWindowControllerMus;
class WmWindowMus;
// WmShell implementation for mus.
-class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
+class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {
public:
WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
WindowManager* window_manager);
@@ -46,7 +46,7 @@ class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
// Returns the ancestor of |window| (including |window|) that is considered
// toplevel. |window| may be null.
- static WmWindowMus* GetToplevelAncestor(::ui::Window* window);
+ static WmWindowMus* GetToplevelAncestor(ui::Window* window);
WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id);
@@ -95,15 +95,15 @@ class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
#endif
private:
- ::ui::WindowTreeClient* window_tree_client();
+ ui::WindowTreeClient* window_tree_client();
// Returns true if |window| is a window that can have active children.
- static bool IsActivationParent(::ui::Window* window);
+ static bool IsActivationParent(ui::Window* window);
- // ::ui::WindowTreeClientObserver:
- void OnWindowTreeFocusChanged(::ui::Window* gained_focus,
- ::ui::Window* lost_focus) override;
- void OnDidDestroyClient(::ui::WindowTreeClient* client) override;
+ // ui::WindowTreeClientObserver:
+ void OnWindowTreeFocusChanged(ui::Window* gained_focus,
+ ui::Window* lost_focus) override;
+ void OnDidDestroyClient(ui::WindowTreeClient* client) override;
WindowManager* window_manager_;
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698