chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_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/metrics/chrome_browser_main_extra_parts_metrics_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/metrics/chrome_browser_main_extra_parts_metrics.cc ('k') | chrome/browser/metrics/chromeos_metrics_provider.cc » ('j') | chrome/browser/thumbnails/simple_thumbnail_crop.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc

diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc

index 27ba4bb3828cba8755f812a25607217b04814953..b65c6fa33625d5333cc2097c22db20b12ecc3647 100644

--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc

+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc

@@ -10,9 +10,9 @@

#include "base/message_loop/message_loop.h"

#include "base/test/histogram_tester.h"

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

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

#include "ui/events/test/device_data_manager_test_api.h"

#include "ui/gfx/geometry/size.h"

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

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

namespace {

@@ -43,12 +43,12 @@ class ChromeBrowserMainExtraPartsMetricsTest : public testing::Test {

ChromeBrowserMainExtraPartsMetricsTest::ChromeBrowserMainExtraPartsMetricsTest()

: device_data_manager_test_api_() {

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

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

}

ChromeBrowserMainExtraPartsMetricsTest::

~ChromeBrowserMainExtraPartsMetricsTest() {

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

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

}

// Verify a TouchEventsEnabled value isn't recorded during construction.