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

Unified Diff: ui/display/screen_unittest.cc

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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 | « ui/display/screen.cc ('k') | ui/display/test/display_manager_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/screen_unittest.cc
diff --git a/ui/display/screen_unittest.cc b/ui/display/screen_unittest.cc
index 90ef0004945d6094668d878eb0e0afba833efbbd..7f7d4ef38183bed34d118c108ae0c5aedfea797f 100644
--- a/ui/display/screen_unittest.cc
+++ b/ui/display/screen_unittest.cc
@@ -21,21 +21,20 @@ const int DEFAULT_DISPLAY_HEIGHT = 1440;
class ScreenTest : public testing::Test {
protected:
ScreenTest() {
- const display::Display test_display = test_screen_.GetPrimaryDisplay();
- display::Display display(test_display);
+ const Display test_display = test_screen_.GetPrimaryDisplay();
+ Display display(test_display);
display.set_id(DEFAULT_DISPLAY_ID);
display.set_bounds(
gfx::Rect(0, 0, DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT));
test_screen_.display_list().RemoveDisplay(test_display.id());
- test_screen_.display_list().AddDisplay(display,
- display::DisplayList::Type::PRIMARY);
+ test_screen_.display_list().AddDisplay(display, DisplayList::Type::PRIMARY);
Screen::SetScreenInstance(&test_screen_);
}
~ScreenTest() override { Screen::SetScreenInstance(nullptr); }
private:
- display::test::TestScreen test_screen_;
+ test::TestScreen test_screen_;
DISALLOW_COPY_AND_ASSIGN(ScreenTest);
};
@@ -59,4 +58,4 @@ TEST_F(ScreenTest, GetDisplayWithDisplayId) {
EXPECT_EQ(DEFAULT_DISPLAY_HEIGHT, display.size().height());
}
-} // namespace
+} // namespace display
« no previous file with comments | « ui/display/screen.cc ('k') | ui/display/test/display_manager_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698