Try to restore window.opener when opening blocked popups

chrome/browser/ui/browser_navigator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/session_storage_namespace.h"
+#include "content/public/browser/site_instance.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/window.h"
 #endif
 
 using content::GlobalRequestID;
 using content::WebContents;
 
@@ skipping 272 matching lines @@
         params.source_contents->GetView()->GetContainerSize();
   }
 #if defined(USE_AURA)
   if (params.browser->window() &&
       params.browser->window()->GetNativeWindow()) {
     create_params.context =
         params.browser->window()->GetNativeWindow();
   }
 #endif
 
-  content::WebContents* target_contents = WebContents::Create(create_params);
+  content::SessionStorageNamespaceMap namespace_map;
+  if (params.source_contents && params.should_copy_session_storage_namespace) {
+    Profile* source_profile = Profile::FromBrowserContext(
+        params.source_contents->GetBrowserContext());
+    // TODO(jochen): once we use more than two storage partitions in chrome, we
+    // will need to revise this logic to clone the session storage namespace in
+    // the correct partition. For now, using the opener site instance to
+    // determine the storage partition is always ok.

[awong, 2013/07/31 18:58:59]

This can never happen now. Each RenderViewHost should only ever have 1
StoragePartitionNamespace so you should be able to just clone it.

+    content::SiteInstance* site_instance =
+        params.source_contents->GetSiteInstance();
+
+    // Compare to RenderMessageFilter::OnCreateWindow() and
+    // WebContentsImpl::CreateNewWindow().
+    std::string partition_id = source_profile->GetStoragePartitionIdForSite(
+        site_instance->GetSiteURL());
+    content::StoragePartition* partition =
+        content::BrowserContext::GetStoragePartition(source_profile,
+                                                     site_instance);
+    content::SessionStorageNamespaceMap::const_iterator old_namespace =
+        params.source_contents->GetController().GetSessionStorageNamespaceMap()
+            .find(partition_id);
+    scoped_refptr<content::SessionStorageNamespace> cloned_namespace =
+        content::SessionStorageNamespace::Clone(
+            partition->GetDOMStorageContext(), old_namespace->second.get());
+    namespace_map.insert(make_pair(partition_id, cloned_namespace));

[awong, 2013/07/31 18:58:59]

We should remove the SessionStorageNamespaceMap, which should remove the need to
expose a partition_id.

+  }
+  WebContents* target_contents = WebContents::CreateWithSessionStorage(
+      create_params,
+      namespace_map,
+      params.should_set_opener ? params.source_contents : NULL);
+
   // New tabs can have WebUI URLs that will make calls back to arbitrary
   // tab helpers, so the entire set of tab helpers needs to be set up
   // immediately.
   BrowserNavigatorWebContentsAdoption::AttachTabHelpers(target_contents);
   extensions::TabHelper::FromWebContents(target_contents)->
       SetExtensionAppById(params.extension_app_id);
   // TODO(sky): Figure out why this is needed. Without it we seem to get
   // failures in startup tests.
   // By default, content believes it is not hidden.  When adding contents
   // in the background, tell it that it's hidden.
@@ skipping 43 matching lines @@
       is_renderer_initiated(false),
       tabstrip_index(-1),
       tabstrip_add_types(TabStripModel::ADD_ACTIVE),
       window_action(NO_ACTION),
       user_gesture(true),
       path_behavior(RESPECT),
       ref_behavior(IGNORE_REF),
       browser(a_browser),
       initiating_profile(NULL),
       host_desktop_type(GetHostDesktop(a_browser)),
-      should_replace_current_entry(false) {
+      should_replace_current_entry(false),
+      should_copy_session_storage_namespace(false),
+      should_set_opener(false) {
 }
 
 NavigateParams::NavigateParams(Browser* a_browser,
                                WebContents* a_target_contents)
     : target_contents(a_target_contents),
       source_contents(NULL),
       disposition(CURRENT_TAB),
       transition(content::PAGE_TRANSITION_LINK),
       is_renderer_initiated(false),
       tabstrip_index(-1),
       tabstrip_add_types(TabStripModel::ADD_ACTIVE),
       window_action(NO_ACTION),
       user_gesture(true),
       path_behavior(RESPECT),
       ref_behavior(IGNORE_REF),
       browser(a_browser),
       initiating_profile(NULL),
       host_desktop_type(GetHostDesktop(a_browser)),
-      should_replace_current_entry(false) {
+      should_replace_current_entry(false),
+      should_copy_session_storage_namespace(false),
+      should_set_opener(false) {
 }
 
 NavigateParams::NavigateParams(Profile* a_profile,
                                const GURL& a_url,
                                content::PageTransition a_transition)
     : url(a_url),
       target_contents(NULL),
       source_contents(NULL),
       disposition(NEW_FOREGROUND_TAB),
       transition(a_transition),
       is_renderer_initiated(false),
       tabstrip_index(-1),
       tabstrip_add_types(TabStripModel::ADD_ACTIVE),
       window_action(SHOW_WINDOW),
       user_gesture(true),
       path_behavior(RESPECT),
       ref_behavior(IGNORE_REF),
       browser(NULL),
       initiating_profile(a_profile),
       host_desktop_type(chrome::GetActiveDesktop()),
-      should_replace_current_entry(false) {
+      should_replace_current_entry(false),
+      should_copy_session_storage_namespace(false),
+      should_set_opener(false) {
 }
 
 NavigateParams::~NavigateParams() {}
 
 void FillNavigateParamsFromOpenURLParams(chrome::NavigateParams* nav_params,
                                          const content::OpenURLParams& params) {
   nav_params->referrer = params.referrer;
   nav_params->extra_headers = params.extra_headers;
   nav_params->disposition = params.disposition;
   nav_params->override_encoding = params.override_encoding;
@@ skipping 223 matching lines @@
   bool reverse_on_redirect = false;
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url, browser_context, &reverse_on_redirect);
 
   // Some URLs are mapped to uber subpages. Do not allow them in incognito.
   return !(rewritten_url.scheme() == chrome::kChromeUIScheme &&
            rewritten_url.host() == chrome::kChromeUIUberHost);
 }
 
 }  // namespace chrome