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

Unified Diff: ash/mus/test/wm_test_base.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/status_layout_manager.cc ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/test/wm_test_base.h
diff --git a/ash/mus/test/wm_test_base.h b/ash/mus/test/wm_test_base.h
index 16fbc82930df9ca733458e9a33d4a788ee79cd17..8872208ccdfa4de49aaf567851754569a071dd85 100644
--- a/ash/mus/test/wm_test_base.h
+++ b/ash/mus/test/wm_test_base.h
@@ -44,8 +44,8 @@ class WmTestBase : public testing::Test {
// See test::DisplayManagerTestApi::UpdateDisplay for more details.
void UpdateDisplay(const std::string& display_spec);
- ::ui::Window* GetPrimaryRootWindow();
- ::ui::Window* GetSecondaryRootWindow();
+ ui::Window* GetPrimaryRootWindow();
+ ui::Window* GetSecondaryRootWindow();
display::Display GetPrimaryDisplay();
display::Display GetSecondaryDisplay();
@@ -54,14 +54,14 @@ class WmTestBase : public testing::Test {
// NOTE: you can explicitly destroy the returned value if necessary, but it
// will also be automatically destroyed when the WindowTreeClient is
// destroyed.
- ::ui::Window* CreateTestWindow(const gfx::Rect& bounds);
- ::ui::Window* CreateTestWindow(const gfx::Rect& bounds,
- ui::wm::WindowType window_type);
- ::ui::Window* CreateFullscreenTestWindow();
+ ui::Window* CreateTestWindow(const gfx::Rect& bounds);
+ ui::Window* CreateTestWindow(const gfx::Rect& bounds,
+ ui::wm::WindowType window_type);
+ ui::Window* CreateFullscreenTestWindow();
// Creates a window parented to |parent|. The returned window is visible.
- ::ui::Window* CreateChildTestWindow(::ui::Window* parent,
- const gfx::Rect& bounds);
+ ui::Window* CreateChildTestWindow(ui::Window* parent,
+ const gfx::Rect& bounds);
protected:
// testing::Test:
« no previous file with comments | « ash/mus/status_layout_manager.cc ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698