summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-12 02:47:26 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-12 02:47:26 +0000
commit8ab0465a0a52812b600580540a69ba4687e4ef22 (patch)
tree12c5483360d5174a2906e84234f4d3db72d8471d /chrome/browser/notifications
parent69a83853994057c9bb81fbc8e184cf36650293db (diff)
downloadchromium_src-8ab0465a0a52812b600580540a69ba4687e4ef22.zip
chromium_src-8ab0465a0a52812b600580540a69ba4687e4ef22.tar.gz
chromium_src-8ab0465a0a52812b600580540a69ba4687e4ef22.tar.bz2
Added plumbing to transport the frame name between RenderViewHost and the Webkit layer.
Extended ViewMsg_New and ViewHostMsg_CreateWindow to have a new frame_name parameter. This allows the RVH to know the initial name of the frame associated with its RenderView, and also to set the name of the frame when creating a new RenderView. Review URL: http://codereview.chromium.org/2775003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
-rw-r--r--chrome/browser/notifications/balloon_host.cc8
-rw-r--r--chrome/browser/notifications/balloon_host.h3
2 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc
index c07593e..1c8fc17 100644
--- a/chrome/browser/notifications/balloon_host.cc
+++ b/chrome/browser/notifications/balloon_host.cc
@@ -88,14 +88,16 @@ void BalloonHost::ProcessDOMUIMessage(const std::string& message,
// open pages in new tabs.
void BalloonHost::CreateNewWindow(
int route_id,
- WindowContainerType window_container_type) {
+ WindowContainerType window_container_type,
+ const string16& frame_name) {
delegate_view_helper_.CreateNewWindow(
route_id,
balloon_->profile(),
site_instance_.get(),
DOMUIFactory::GetDOMUIType(balloon_->notification().content_url()),
this,
- window_container_type);
+ window_container_type,
+ frame_name);
}
void BalloonHost::ShowCreatedWindow(int route_id,
@@ -149,7 +151,7 @@ void BalloonHost::Init() {
DCHECK(render_widget_host_view());
rvh->set_view(render_widget_host_view());
- rvh->CreateRenderView(GetProfile()->GetRequestContext());
+ rvh->CreateRenderView(GetProfile()->GetRequestContext(), string16());
rvh->NavigateToURL(balloon_->notification().content_url());
initialized_ = true;
diff --git a/chrome/browser/notifications/balloon_host.h b/chrome/browser/notifications/balloon_host.h
index 06c780e..07ddf3d 100644
--- a/chrome/browser/notifications/balloon_host.h
+++ b/chrome/browser/notifications/balloon_host.h
@@ -83,7 +83,8 @@ class BalloonHost : public RenderViewHostDelegate,
// windows are currently implemented.
virtual void CreateNewWindow(
int route_id,
- WindowContainerType window_container_type);
+ WindowContainerType window_container_type,
+ const string16& frame_name);
virtual void CreateNewWidget(int route_id, WebKit::WebPopupType popup_type) {}
virtual void ShowCreatedWindow(int route_id,
WindowOpenDisposition disposition,