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

Unified Diff: content/shell/app/shell_main_delegate.cc

Issue 1571833002: Add popup layout tests with device scale factor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « content/renderer/render_widget.cc ('k') | content/shell/common/shell_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index fa6993b0b2af52730262d6fc4b413bc7de681e02..1c9f074aaf16b55ab68ab2cf266a94acd7b5a11e 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -170,7 +170,8 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
command_line.AppendSwitch(switches::kSkipGpuDataLoading);
command_line.AppendSwitchASCII(switches::kTouchEvents,
switches::kTouchEventsEnabled);
- command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
+ if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor))
+ command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
command_line.AppendSwitch(
switches::kDisableGestureRequirementForMediaPlayback);
« no previous file with comments | « content/renderer/render_widget.cc ('k') | content/shell/common/shell_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698