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

Unified Diff: ui/views/widget/desktop_aura/desktop_screen_x11.cc

Issue 1525933002: Support device scale factor test with popups in LayoutTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: ui/views/widget/desktop_aura/desktop_screen_x11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.cc b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
index 221465432a889d0b32d0c3f1eae502acfc4bb0e5..7486332abd406002661d2735d27a812d0194cb29 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
@@ -10,7 +10,9 @@
// It clashes with out RootWindow.
#undef RootWindow
+#include "base/command_line.h"
#include "base/logging.h"
+#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
@@ -252,6 +254,13 @@ uint32_t DesktopScreenX11::DispatchEvent(const ui::PlatformEvent& event) {
return ui::POST_DISPATCH_NONE;
}
+// static
+void DesktopScreenX11::UpdateDeviceScaleFactorForTest() {
+ DesktopScreenX11* screen =
+ static_cast<DesktopScreenX11*>(gfx::Screen::GetNativeScreen());
+ screen->ConfigureTimerFired();
+}
+
sadrul 2015/12/16 19:13:19 Perhaps this could go in a TestApi instead.
////////////////////////////////////////////////////////////////////////////////
// DesktopScreenX11, private:

Powered by Google App Engine
This is Rietveld 408576698