Pass DefaultDeviceScaleFactor to webkit

content/browser/tab_contents/tab_contents.cc

Index: content/browser/tab_contents/tab_contents.cc
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index a7c8b81ebd72b92b3155ddd73d7eb664a9a09205..f0af362dc5d8cb3e2d7b44127895108eb709f1fc 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -10,6 +10,7 @@
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string16.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ -457,6 +458,13 @@ WebPreferences TabContents::GetWebkitPrefs(RenderViewHost* rvh,
     prefs.accelerated_2d_canvas_enabled = false;
   }
 
+  int default_device_scale_factor;
+  base::StringToInt(command_line.GetSwitchValueASCII(
+                    switches::kDefaultDeviceScaleFactor),

[darin (slow to review), 2012/02/29 22:15:06]

nit: indent parameter to GetSwitchValueASCII so it doesn't look like it is a
parameter to StringToInt.

[tdresser, 2012/03/01 14:05:11]

Done.

+                    &default_device_scale_factor);
+
+  prefs.default_device_scale_factor = default_device_scale_factor;
+
   content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, &prefs);
 
   return prefs;