Merge 222640 "Use the top-level URL for popup blocking."

content/common/view_messages.h

 // 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.
 
 // IPC messages for page rendering.
 // Multiply-included message file, hence no include guard.
 
 #include "base/memory/shared_memory.h"
 #include "base/process/process.h"
 #include "base/strings/string16.h"
@@ skipping 321 matching lines @@
   // The name of the resulting frame that should be created (empty if none
   // has been specified).
   IPC_STRUCT_MEMBER(string16, frame_name)
 
   // The frame identifier of the frame initiating the open.
   IPC_STRUCT_MEMBER(int64, opener_frame_id)
 
   // The URL of the frame initiating the open.
   IPC_STRUCT_MEMBER(GURL, opener_url)
 
+  // The URL of the top frame containing the opener.
+  IPC_STRUCT_MEMBER(GURL, opener_top_level_frame_url)
+
   // The security origin of the frame initiating the open.
   IPC_STRUCT_MEMBER(GURL, opener_security_origin)
 
   // Whether the opener will be suppressed in the new window, in which case
   // scripting the new window is not allowed.
   IPC_STRUCT_MEMBER(bool, opener_suppressed)
 
   // Whether the window should be opened in the foreground, background, etc.
   IPC_STRUCT_MEMBER(WindowOpenDisposition, disposition)
 
@@ skipping 2012 matching lines @@
 // synchronously (see crbug.com/120597). This IPC message sends the character
 // bounds after every composition change to always have correct bound info.
 IPC_MESSAGE_ROUTED2(ViewHostMsg_ImeCompositionRangeChanged,
                     ui::Range /* composition range */,
                     std::vector<gfx::Rect> /* character bounds */)
 #endif
 
 // Adding a new message? Stick to the sort order above: first platform
 // independent ViewMsg, then ifdefs for platform specific ViewMsg, then platform
 // independent ViewHostMsg, then ifdefs for platform specific ViewHostMsg.