chrome/browser/manifest/manifest_icon_selector_unittest.cc - Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/manifest/manifest_icon_selector_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

« no previous file with comments | « chrome/browser/manifest/manifest_icon_selector.cc ('k') | chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/manifest/manifest_icon_selector_unittest.cc

diff --git a/chrome/browser/manifest/manifest_icon_selector_unittest.cc b/chrome/browser/manifest/manifest_icon_selector_unittest.cc

index 685574c47f41a09dd50ea5458f275d5a5d9b1546..8d2d3ce3a1b2142b5176ed0aa190aceb37cca854 100644

--- a/chrome/browser/manifest/manifest_icon_selector_unittest.cc

+++ b/chrome/browser/manifest/manifest_icon_selector_unittest.cc

@@ -10,7 +10,7 @@

#include "base/macros.h"

#include "base/strings/utf_string_conversions.h"

#include "testing/gtest/include/gtest/gtest.h"

-#include "ui/gfx/screen.h"

+#include "ui/display/screen.h"

#include "ui/gfx/test/test_screen.h"

namespace {

@@ -22,11 +22,11 @@ class ManifestIconSelectorTest : public testing::Test {

ManifestIconSelectorTest() {

test_screen_.display()->set_id(0x1337);

test_screen_.display()->set_bounds(gfx::Rect(0, 0, 2560, 1440));

- gfx::Screen::SetScreenInstance(&test_screen_);

+ display::Screen::SetScreenInstance(&test_screen_);

}

~ManifestIconSelectorTest() override {

- gfx::Screen::SetScreenInstance(nullptr);

+ display::Screen::SetScreenInstance(nullptr);

}

void SetUp() override {