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

Unified Diff: chrome/browser/sync/sync_error_notifier_ash_unittest.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
Index: chrome/browser/sync/sync_error_notifier_ash_unittest.cc
diff --git a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
index ddd0ee0657229c267c4c1e67579dd6ebae7943e6..da5a6837b773c9a48ade695df6777b37900f57fb 100644
--- a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
+++ b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
@@ -31,7 +31,7 @@
#if defined(OS_WIN)
#include "chrome/browser/ui/ash/ash_util.h"
#include "ui/aura/test/test_screen.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
#endif
using ::testing::NiceMock;
@@ -89,7 +89,7 @@ class SyncErrorNotifierTest : public AshTestBase {
// adding desktop widgets (i.e., message center notifications).
#if defined(OS_WIN)
test_screen_.reset(aura::TestScreen::Create(gfx::Size()));
- gfx::Screen::SetScreenInstance(test_screen_.get());
+ display::Screen::SetScreenInstance(test_screen_.get());
#endif
AshTestBase::SetUp();
@@ -123,7 +123,7 @@ class SyncErrorNotifierTest : public AshTestBase {
AshTestBase::TearDown();
#if defined(OS_WIN)
- gfx::Screen::SetScreenInstance(nullptr);
+ display::Screen::SetScreenInstance(nullptr);
test_screen_.reset();
#endif
@@ -159,7 +159,7 @@ class SyncErrorNotifierTest : public AshTestBase {
}
#if defined(OS_WIN)
- std::unique_ptr<gfx::Screen> test_screen_;
+ std::unique_ptr<display::Screen> test_screen_;
#endif
std::unique_ptr<TestingProfileManager> profile_manager_;
std::unique_ptr<SyncErrorController> error_controller_;

Powered by Google App Engine
This is Rietveld 408576698