diff options
| author | scottmg <scottmg@chromium.org> | 2016-01-26 17:30:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-27 01:31:58 +0000 |
| commit | fb33c340bd50b0e8a5c874e5d7c10a6361cee126 (patch) | |
| tree | bb7a28d9d333accda14d8cbce5d9c6e7b4f51698 /content/browser/media | |
| parent | bfe14dd182c7c660eb27265dfeec462768af2422 (diff) | |
| download | chromium_src-fb33c340bd50b0e8a5c874e5d7c10a6361cee126.zip chromium_src-fb33c340bd50b0e8a5c874e5d7c10a6361cee126.tar.gz chromium_src-fb33c340bd50b0e8a5c874e5d7c10a6361cee126.tar.bz2 | |
Remove ui/gfx/screen_type_delegate.h
This removes gfx::SCREEN_TYPE_NATIVE/SCREEN_TYPE_ALTERNATE, and there is
now only one Screen instance. It's still a runtime-installed thing for
test purposes.
TBR=various owners for trivial changes
R=oshima@chromium.org, sky@chromium.org
BUG=558054
Review URL: https://codereview.chromium.org/1608733002
Cr-Commit-Position: refs/heads/master@{#371676}
Diffstat (limited to 'content/browser/media')
| -rw-r--r-- | content/browser/media/capture/web_contents_video_capture_device_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc index 9e3bf83..0d50e4d 100644 --- a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc +++ b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc @@ -590,8 +590,8 @@ class MAYBE_WebContentsVideoCaptureDeviceTest : public testing::Test { test_screen_.display()->set_bounds(gfx::Rect(0, 0, 2560, 1440)); test_screen_.display()->set_device_scale_factor(kTestDeviceScaleFactor); - gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, &test_screen_); - ASSERT_EQ(&test_screen_, gfx::Screen::GetNativeScreen()); + gfx::Screen::SetScreenInstance(&test_screen_); + ASSERT_EQ(&test_screen_, gfx::Screen::GetScreen()); // TODO(nick): Sadness and woe! Much "mock-the-world" boilerplate could be // eliminated here, if only we could use RenderViewHostTestHarness. The @@ -649,7 +649,7 @@ class MAYBE_WebContentsVideoCaptureDeviceTest : public testing::Test { render_view_host_factory_.reset(); render_process_host_factory_.reset(); - gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); + gfx::Screen::SetScreenInstance(nullptr); } // Accessors. |