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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: GetNativeScreen Created 4 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
« chrome/browser/ui/views/tabs/window_finder_x11.cc ('K') | « content/browser/media/capture/web_contents_video_capture_device_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | ui/base/layout.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index c76fc12376bc593e4f6033d855b8005889f759e0..6af2611d9d34c8e4502dabbf01dda12577ee995f 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -462,7 +462,7 @@ class RenderWidgetHostTest : public testing::Test {
#endif
#if defined(USE_AURA)
screen_.reset(aura::TestScreen::Create(gfx::Size()));
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
+ gfx::Screen::SetScreenInstance(screen_.get());
#endif
host_.reset(new MockRenderWidgetHost(delegate_.get(), process_,
process_->GetNextRoutingID()));
@@ -482,7 +482,7 @@ class RenderWidgetHostTest : public testing::Test {
browser_context_.reset();
#if defined(USE_AURA)
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr);
+ gfx::Screen::SetScreenInstance(nullptr);
screen_.reset();
#endif
#if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS))
« chrome/browser/ui/views/tabs/window_finder_x11.cc ('K') | « content/browser/media/capture/web_contents_video_capture_device_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | ui/base/layout.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698