chrome/browser/chromeos/power/extension_event_observer_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/chromeos/power/extension_event_observer_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/chromeos/policy/display_rotation_default_handler_browsertest.cc ('k') | chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/power/extension_event_observer_unittest.cc

diff --git a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc

index d5becf0a844c96e7d326a2234e1c47ce0189d452..32782aaba00228b5f30c00d8f6ec558c78c5776b 100644

--- a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc

+++ b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc

@@ -34,7 +34,7 @@

#include "extensions/common/value_builder.h"

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

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

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

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

namespace chromeos {

@@ -65,7 +65,7 @@ class ExtensionEventObserverTest : public ::testing::Test {

void SetUp() override {

::testing::Test::SetUp();

- gfx::Screen::SetScreenInstance(test_screen_.get());

+ display::Screen::SetScreenInstance(test_screen_.get());

// Must be called from ::testing::Test::SetUp.

ASSERT_TRUE(profile_manager_->SetUp());

@@ -82,7 +82,7 @@ class ExtensionEventObserverTest : public ::testing::Test {

void TearDown() override {

profile_ = NULL;

profile_manager_->DeleteAllTestingProfiles();

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

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

::testing::Test::TearDown();

}