Include 2x assets when enable_hidpi=1 is specified on linux_aura

ui/base/resource/resource_bundle.cc

Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 4371e4fed6c73b30e95c06350e35e4243287548d..2cfe06cc11c2a7ecf6b81a1f75ed8508c781de1e 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -571,6 +571,8 @@ void ResourceBundle::InitSharedInstance(Delegate* delegate) {
 #elif defined(OS_CHROMEOS)
   // TODO(oshima): Include 200P only if the device support 200P
   supported_scale_factors.push_back(SCALE_FACTOR_200P);
+#elif defined(OS_LINUX) && defined(ENABLE_HIDPI)

[tony, 2014/01/10 17:38:27]

Nit: Maybe merge this with the OS_CHROMEOS line above?

[oshima, 2014/01/10 18:46:44]

I'd like to keep it separate because I don't know which scale factors we want to
support on linux_aura. I just want to add 200P as a tentative value to allow us
start working on high DPI support on linux aura.

+  supported_scale_factors.push_back(SCALE_FACTOR_200P);
 #endif
   ui::SetSupportedScaleFactors(supported_scale_factors);
 #if defined(OS_WIN)