setting nw window id when new window is created

For nwjs/nw.js#1519

content/browser/frame_host/navigation_controller_impl.cc

@@ -720,6 +720,7 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) {
       break;
   };
 
+  entry->set_nw_win_id(params.nw_win_id);
   LoadEntry(entry);
 }
 

content/browser/frame_host/navigation_entry_impl.cc

@@ -52,7 +52,8 @@ NavigationEntryImpl::NavigationEntryImpl()
       is_renderer_initiated_(false),
       should_replace_entry_(false),
       should_clear_history_list_(false),
-      can_load_local_resources_(false) {
+      can_load_local_resources_(false),
+      nw_win_id_(0) {
 }
 
 NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance,
@@ -80,7 +81,8 @@ NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance,
       is_renderer_initiated_(is_renderer_initiated),
       should_replace_entry_(false),
       should_clear_history_list_(false),
-      can_load_local_resources_(false) {
+      can_load_local_resources_(false),
+      nw_win_id_(0) {
 }
 
 NavigationEntryImpl::~NavigationEntryImpl() {

content/browser/frame_host/navigation_entry_impl.h

@@ -223,6 +223,9 @@ class CONTENT_EXPORT NavigationEntryImpl
     return is_dev_reload_;
   }
 
+  void set_nw_win_id(int id) { nw_win_id_ = id; }
+  int nw_win_id() const { return nw_win_id_; }
+
  private:
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
   // Session/Tab restore save portions of this class so that it can be recreated
@@ -336,6 +339,8 @@ class CONTENT_EXPORT NavigationEntryImpl
   std::map<std::string, string16> extra_data_;
 
   bool is_dev_reload_;
+
+  int nw_win_id_;
   // Copy and assignment is explicitly allowed for this class.
 };
 

content/browser/frame_host/render_view_host_manager.cc

@@ -167,7 +167,7 @@ RenderViewHostImpl* RenderViewHostManager::Navigate(
     // Recreate the opener chain.
     int opener_route_id = delegate_->CreateOpenerRenderViewsForRenderManager(
         dest_render_view_host->GetSiteInstance());
-    if (!InitRenderView(dest_render_view_host, opener_route_id))
+    if (!InitRenderView(dest_render_view_host, opener_route_id, entry.nw_win_id()))
       return NULL;
 
     // Now that we've created a new renderer, be sure to hide it if it isn't
@@ -709,7 +709,8 @@ int RenderViewHostManager::CreateRenderView(
     SiteInstance* instance,
     int opener_route_id,
     bool swapped_out,
-    bool hidden) {
+    bool hidden,
+    int nw_win_id) {
   CHECK(instance);
   DCHECK(!swapped_out || hidden); // Swapped out views should always be hidden.
 
@@ -741,7 +742,7 @@ int RenderViewHostManager::CreateRenderView(
       new_render_view_host->GetProcess()->AddPendingView();
     }
 
-    bool success = InitRenderView(new_render_view_host, opener_route_id);
+    bool success = InitRenderView(new_render_view_host, opener_route_id, nw_win_id);
     if (success) {
       // Don't show the view until we get a DidNavigate from it.
       new_render_view_host->GetView()->Hide();
@@ -758,14 +759,16 @@ int RenderViewHostManager::CreateRenderView(
 }
 
 bool RenderViewHostManager::InitRenderView(RenderViewHost* render_view_host,
-                                           int opener_route_id) {
+                                           int opener_route_id,
+                                           int nw_win_id) {
   // If the pending navigation is to a WebUI and the RenderView is not in a
   // guest process, tell the RenderView about any bindings it will need enabled.
   if (pending_web_ui() && !render_view_host->GetProcess()->IsGuest())
     render_view_host->AllowBindings(pending_web_ui()->GetBindings());
 
   return delegate_->CreateRenderViewForRenderManager(render_view_host,
-                                                     opener_route_id);
+                                                     opener_route_id,
+                                                     nw_win_id);
 }
 
 void RenderViewHostManager::CommitPending() {
@@ -949,7 +952,7 @@ RenderViewHostImpl* RenderViewHostManager::UpdateRendererStateForNavigate(
     // Create a non-swapped-out pending RVH with the given opener and navigate
     // it.
     int route_id = CreateRenderView(new_instance, opener_route_id, false,
-                                    delegate_->IsHidden());
+                                    delegate_->IsHidden(), entry.nw_win_id());
     if (route_id == MSG_ROUTING_NONE)
       return NULL;
 

content/browser/frame_host/render_view_host_manager.h

@@ -58,7 +58,7 @@ class CONTENT_EXPORT RenderViewHostManager
     // If you are attaching to an already-existing RenderView, you should call
     // InitWithExistingID.
     virtual bool CreateRenderViewForRenderManager(
-        RenderViewHost* render_view_host, int opener_route_id) = 0;
+        RenderViewHost* render_view_host, int opener_route_id, int nw_win_id = 0) = 0;
     virtual void BeforeUnloadFiredFromRenderManager(
         bool proceed, const base::TimeTicks& proceed_time,
         bool* proceed_to_fire_unload) = 0;
@@ -188,7 +188,8 @@ class CONTENT_EXPORT RenderViewHostManager
   int CreateRenderView(SiteInstance* instance,
                        int opener_route_id,
                        bool swapped_out,
-                       bool hidden);
+                       bool hidden,
+                       int nw_win_id = 0);
 
   // Called when a provisional load on the given renderer is aborted.
   void RendererAbortedProvisionalLoad(RenderViewHost* render_view_host);
@@ -315,7 +316,7 @@ class CONTENT_EXPORT RenderViewHostManager
       SiteInstance* curr_instance);
 
   // Sets up the necessary state for a new RenderViewHost with the given opener.
-  bool InitRenderView(RenderViewHost* render_view_host, int opener_route_id);
+  bool InitRenderView(RenderViewHost* render_view_host, int opener_route_id, int nw_win_id);
 
   // Sets the pending RenderViewHost/WebUI to be the active one. Note that this
   // doesn't require the pending render_view_host_ pointer to be non-NULL, since

content/browser/renderer_host/render_view_host_impl.cc

@@ -245,7 +245,8 @@ SiteInstance* RenderViewHostImpl::GetSiteInstance() const {
 bool RenderViewHostImpl::CreateRenderView(
     const string16& frame_name,
     int opener_route_id,
-    int32 max_page_id) {
+    int32 max_page_id,
+    int nw_win_id) {
   TRACE_EVENT0("renderer_host", "RenderViewHostImpl::CreateRenderView");
   DCHECK(!IsRenderViewLive()) << "Creating view twice";
 
@@ -287,6 +288,7 @@ bool RenderViewHostImpl::CreateRenderView(
   GetWebScreenInfo(&params.screen_info);
   params.accessibility_mode = accessibility_mode();
   params.allow_partial_swap = !GetProcess()->IsGuest();
+  params.nw_win_id = nw_win_id;
 
   Send(new ViewMsg_New(params));
 

content/browser/renderer_host/render_view_host_impl.h

@@ -234,7 +234,8 @@ class CONTENT_EXPORT RenderViewHostImpl
   // RenderView is told to start issuing page IDs at |max_page_id| + 1.
   virtual bool CreateRenderView(const string16& frame_name,
                                 int opener_route_id,
-                                int32 max_page_id);
+                                int32 max_page_id,
+                                int nw_win_id = 0);
 
   base::TerminationStatus render_view_termination_status() const {
     return render_view_termination_status_;

content/browser/web_contents/web_contents_impl.cc

@@ -3545,7 +3545,7 @@ NavigationEntry*
 }
 
 bool WebContentsImpl::CreateRenderViewForRenderManager(
-    RenderViewHost* render_view_host, int opener_route_id) {
+    RenderViewHost* render_view_host, int opener_route_id, int nw_win_id) {
   TRACE_EVENT0("browser", "WebContentsImpl::CreateRenderViewForRenderManager");
   // Can be NULL during tests.
   RenderWidgetHostView* rwh_view = view_->CreateViewForWidget(render_view_host);
@@ -3562,7 +3562,7 @@ bool WebContentsImpl::CreateRenderViewForRenderManager(
   if (!static_cast<RenderViewHostImpl*>(
           render_view_host)->CreateRenderView(string16(),
                                               opener_route_id,
-                                              max_page_id)) {
+                                              max_page_id, nw_win_id)) {
     return false;
   }
 

content/browser/web_contents/web_contents_impl.h

@@ -444,7 +444,7 @@ class CONTENT_EXPORT WebContentsImpl
   // RenderViewHostManager::Delegate -------------------------------------------
 
   virtual bool CreateRenderViewForRenderManager(
-      RenderViewHost* render_view_host, int opener_route_id) OVERRIDE;
+      RenderViewHost* render_view_host, int opener_route_id, int nw_win_id = 0) OVERRIDE;
   virtual void BeforeUnloadFiredFromRenderManager(
       bool proceed, const base::TimeTicks& proceed_time,
       bool* proceed_to_fire_unload) OVERRIDE;

content/common/view_messages.h

@@ -756,6 +756,8 @@ IPC_STRUCT_BEGIN(ViewMsg_New_Params)
   // allowed for a renderer. Partial swaps will be used if they are both
   // allowed and supported.
   IPC_STRUCT_MEMBER(bool, allow_partial_swap)
+
+  IPC_STRUCT_MEMBER(int32, nw_win_id)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(ViewMsg_PostMessage_Params)

content/public/browser/navigation_controller.cc

@@ -17,7 +17,8 @@ NavigationController::LoadURLParams::LoadURLParams(const GURL& url)
       browser_initiated_post_data(NULL),
       can_load_local_resources(false),
       should_replace_current_entry(false),
-      should_clear_history_list(false)  {
+      should_clear_history_list(false),
+      nw_win_id(0) {
 }
 
 NavigationController::LoadURLParams::~LoadURLParams() {
@@ -37,7 +38,8 @@ NavigationController::LoadURLParams::LoadURLParams(
       virtual_url_for_data_url(other.virtual_url_for_data_url),
       browser_initiated_post_data(other.browser_initiated_post_data),
       should_replace_current_entry(false),
-      should_clear_history_list(false) {
+      should_clear_history_list(false),
+      nw_win_id(0) {
 }
 
 NavigationController::LoadURLParams&
@@ -57,6 +59,7 @@ NavigationController::LoadURLParams::operator=(
   browser_initiated_post_data = other.browser_initiated_post_data;
   should_replace_current_entry = other.should_replace_current_entry;
   should_clear_history_list = other.should_clear_history_list;
+  nw_win_id = other.nw_win_id;
 
   return *this;
 }

content/public/browser/navigation_controller.h

@@ -171,6 +171,8 @@ class NavigationController {
     // commits.
     bool should_clear_history_list;
 
+    int nw_win_id;
+
     explicit LoadURLParams(const GURL& url);
     ~LoadURLParams();
 

content/renderer/render_thread_impl.cc

@@ -1168,7 +1168,8 @@ void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) {
       params.next_page_id,
       params.screen_info,
       params.accessibility_mode,
-      params.allow_partial_swap);
+      params.allow_partial_swap,
+      params.nw_win_id);
 }
 
 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync(

content/renderer/render_view_impl.cc

@@ -1027,6 +1027,11 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) {
   // This ensures we are in a unique origin that others cannot script.
   if (is_swapped_out_)
     NavigateToSwappedOutURL(webview()->mainFrame());
+
+  if (params->nw_win_id) {
+    v8::Handle<v8::Value> v8win = webview()->mainFrame()->mainWorldScriptContext()->Global();
+    v8win->ToObject()->Set(v8::String::New("__nwWindowId"), v8::Integer::New(params->nw_win_id));
+  }
 }
 
 RenderViewImpl::~RenderViewImpl() {
@@ -1113,7 +1118,8 @@ RenderViewImpl* RenderViewImpl::Create(
     int32 next_page_id,
     const WebKit::WebScreenInfo& screen_info,
     AccessibilityMode accessibility_mode,
-    bool allow_partial_swap) {
+    bool allow_partial_swap,
+    int nw_win_id) {
   DCHECK(routing_id != MSG_ROUTING_NONE);
   RenderViewImplParams params(
       opener_id,
@@ -1130,7 +1136,8 @@ RenderViewImpl* RenderViewImpl::Create(
       next_page_id,
       screen_info,
       accessibility_mode,
-      allow_partial_swap);
+      allow_partial_swap,
+      nw_win_id);
   RenderViewImpl* render_view = NULL;
   if (g_create_render_view_impl)
     render_view = g_create_render_view_impl(&params);

content/renderer/render_view_impl.h

@@ -200,7 +200,8 @@ class CONTENT_EXPORT RenderViewImpl
       int32 next_page_id,
       const WebKit::WebScreenInfo& screen_info,
       AccessibilityMode accessibility_mode,
-      bool allow_partial_swap);
+      bool allow_partial_swap,
+      int nw_win_id = 0);
 
   // Used by content_layouttest_support to hook into the creation of
   // RenderViewImpls.

content/renderer/render_view_impl_params.cc

@@ -21,7 +21,8 @@ RenderViewImplParams::RenderViewImplParams(
     int32 next_page_id,
     const WebKit::WebScreenInfo& screen_info,
     AccessibilityMode accessibility_mode,
-    bool allow_partial_swap)
+    bool allow_partial_swap,
+    int nw_win_id)
     : opener_id(opener_id),
       renderer_prefs(renderer_prefs),
       webkit_prefs(webkit_prefs),
@@ -36,7 +37,8 @@ RenderViewImplParams::RenderViewImplParams(
       next_page_id(next_page_id),
       screen_info(screen_info),
       accessibility_mode(accessibility_mode),
-      allow_partial_swap(allow_partial_swap){
+      allow_partial_swap(allow_partial_swap),
+      nw_win_id(nw_win_id){
 }
 
 RenderViewImplParams::~RenderViewImplParams() {}

content/renderer/render_view_impl_params.h

@@ -37,7 +37,8 @@ struct CONTENT_EXPORT RenderViewImplParams {
                        int32 next_page_id,
                        const WebKit::WebScreenInfo& screen_info,
                        AccessibilityMode accessibility_mode,
-                       bool allow_partial_swap);
+                       bool allow_partial_swap,
+                       int nw_win_id);
   ~RenderViewImplParams();
 
   int32 opener_id;
@@ -55,6 +56,7 @@ struct CONTENT_EXPORT RenderViewImplParams {
   const WebKit::WebScreenInfo& screen_info;
   AccessibilityMode accessibility_mode;
   bool allow_partial_swap;
+  int nw_win_id;
 };
 
 }  // namespace content