rename pending_devreload to pinning_renderer

rogerwang · rogerwang · commit f8216f49d605 · 2012-12-28T10:40:23.000+08:00
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -225,9 +225,9 @@ void Shell::Reload(ReloadType type) {
     case RELOAD_DEV:
       // ShellContentBrowserClient always tries to use the existing
       // process so we need to overwrite it here
-      browser_context->set_pending_devreload(true);
+      browser_context->set_pinning_renderer(false);
       web_contents_->GetController().ReloadDev(false);
-      browser_context->set_pending_devreload(false);
+      browser_context->set_pinning_renderer(true);
       break;
   }
 
diff --git a/src/shell_browser_context.cc b/src/shell_browser_context.cc
@@ -44,7 +44,7 @@ namespace content {
 
 ShellBrowserContext::ShellBrowserContext(bool off_the_record,
                                          nw::Package* package)
-  : is_pending_devreload_(false),
+  : disable_pinning_renderer_(false),
     off_the_record_(off_the_record),
     package_(package) {
   InitWhileIOAllowed();
diff --git a/src/shell_browser_context.h b/src/shell_browser_context.h
@@ -52,14 +52,16 @@ class ShellBrowserContext : public BrowserContext {
       GetSpeechRecognitionPreferences() OVERRIDE;
   virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
 
-  bool pending_devreload() { return is_pending_devreload_; }
-  void set_pending_devreload(bool val) { is_pending_devreload_ = val; }
+  bool pinning_renderer() { return !disable_pinning_renderer_; }
+  void set_pinning_renderer(bool val) { disable_pinning_renderer_ = !val; }
  private:
   // Performs initialization of the ShellBrowserContext while IO is still
   // allowed on the current thread.
   void InitWhileIOAllowed();
 
-  bool is_pending_devreload_;  // whether dev reload is in process
+  bool disable_pinning_renderer_;  // whether dev reload is in process
+                                   // or we want to disable pinning
+                                   // temporarily
   bool off_the_record_;
   nw::Package* package_;
   ScopedTempDir testing_path_;
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -181,10 +181,10 @@ bool ShellContentBrowserClient::ShouldTryToUseExistingProcessHost(
       BrowserContext* browser_context, const GURL& url) {
   ShellBrowserContext* shell_browser_context =
     static_cast<ShellBrowserContext*>(browser_context);
-  if (shell_browser_context->pending_devreload())
-    return false;
-  else
+  if (shell_browser_context->pinning_renderer())
     return true;
+  else
+    return false;
 }
 
 bool ShellContentBrowserClient::IsSuitableHost(RenderProcessHost* process_host,
