Fix nwjs#2854: dom_storage_quota

rogerwang · rogerwang · commit e5dd6d0f7aac · 2014-12-27T14:14:40.000+08:00
Conflicts:
	src/renderer/shell_content_renderer_client.cc
diff --git a/src/renderer/shell_content_renderer_client.cc b/src/renderer/shell_content_renderer_client.cc
@@ -166,6 +166,14 @@ void ShellContentRendererClient::RenderThreadStarted() {
         command_line->GetSwitchValuePath(switches::kWorkingDirectory));
   }
 
+  if (command_line->HasSwitch(switches::kDomStorageQuota)) {
+    std::string quota_str = command_line->GetSwitchValueASCII(switches::kDomStorageQuota);
+    int quota = 0;
+    if (base::StringToInt(quota_str, &quota) && quota > 0) {
+      content::DOMStorageMap::SetQuotaOverride(quota * 1024 * 1024);
+    }
+  }
+
   if (command_line->HasSwitch(extensions::switches::kExtensionProcess)) {
     extensions_client_.reset(CreateExtensionsClient());
     extensions::ExtensionsClient::Set(extensions_client_.get());
@@ -181,16 +189,6 @@ void ShellContentRendererClient::RenderThreadStarted() {
     thread->AddObserver(extension_dispatcher_.get());
   }
 
-#if 0
-  if (command_line->HasSwitch(switches::kDomStorageQuota)) {
-    std::string quota_str = command_line->GetSwitchValueASCII(switches::kDomStorageQuota);
-    int quota = 0;
-    if (base::StringToInt(quota_str, &quota) && quota > 0) {
-      content::DOMStorageMap::SetQuotaOverride(quota * 1024 * 1024);
-    }
-  }
-#endif //0
-
   // Start observers.
   shell_observer_.reset(new ShellRenderProcessObserver());
 
