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

Unified Diff: content/shell/browser/shell.cc

Issue 1534563002: Move to DesktopScreenX11::UpdateDeviceScaleFactor to TestApi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix win build Created 5 years 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 | « no previous file | ui/views/test/desktop_screen_x11_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell.cc
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index de632720474d515549a59a47d3108707c486f457..29e0938dd0b9003dd501019155fff28d0b284b0a 100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -39,7 +39,7 @@
#include "ui/gfx/switches.h"
#if defined(USE_X11) && !defined(OS_CHROMEOS)
-#include "ui/views/widget/desktop_aura/desktop_screen_x11.h"
+#include "ui/views/test/desktop_screen_x11_test_api.h"
#endif
namespace content {
@@ -396,7 +396,7 @@ void Shell::SetDeviceScaleFactor(float scale) {
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kForceDeviceScaleFactor, base::StringPrintf("%f", scale));
#if defined(USE_X11)
- views::DesktopScreenX11::UpdateDeviceScaleFactorForTest();
+ views::test::DesktopScreenX11TestApi::UpdateDisplays();
#endif
#endif
RenderWidgetHostView* host_view = web_contents_->GetRenderWidgetHostView();
« no previous file with comments | « no previous file | ui/views/test/desktop_screen_x11_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698