From 57c6a6579cf274fe37d6196931a3034d90da7113 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Mon, 4 May 2009 07:58:34 +0000 Subject: Replace all occurrances of WebContents with TabContents. Review URL: http://codereview.chromium.org/99177 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15194 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/modal_html_dialog_delegate.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'chrome/browser/modal_html_dialog_delegate.cc') diff --git a/chrome/browser/modal_html_dialog_delegate.cc b/chrome/browser/modal_html_dialog_delegate.cc index 54be702..12cc713 100644 --- a/chrome/browser/modal_html_dialog_delegate.cc +++ b/chrome/browser/modal_html_dialog_delegate.cc @@ -6,18 +6,18 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/web_contents.h" +#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" ModalHtmlDialogDelegate::ModalHtmlDialogDelegate( const GURL& url, int width, int height, const std::string& json_arguments, - IPC::Message* sync_result, WebContents* contents) + IPC::Message* sync_result, TabContents* contents) : contents_(contents), sync_response_(sync_result) { - // Listen for when the WebContents or its renderer dies. + // Listen for when the TabContents or its renderer dies. NotificationService::current()-> - AddObserver(this, NotificationType::WEB_CONTENTS_DISCONNECTED, - Source(contents_)); + AddObserver(this, NotificationType::TAB_CONTENTS_DISCONNECTED, + Source(contents_)); // This information is needed to show the dialog HTML content. params_.url = url; @@ -33,8 +33,8 @@ ModalHtmlDialogDelegate::~ModalHtmlDialogDelegate() { void ModalHtmlDialogDelegate::Observe(NotificationType type, const NotificationSource& source, const NotificationDetails& details) { - DCHECK(type == NotificationType::WEB_CONTENTS_DISCONNECTED); - DCHECK(Source(source).ptr() == contents_); + DCHECK(type == NotificationType::TAB_CONTENTS_DISCONNECTED); + DCHECK(Source(source).ptr() == contents_); RemoveObserver(); } @@ -56,7 +56,7 @@ std::string ModalHtmlDialogDelegate::GetDialogArgs() const { } void ModalHtmlDialogDelegate::OnDialogClosed(const std::string& json_retval) { - // Our WebContents may have died before this point. + // Our TabContents may have died before this point. if (contents_ && contents_->render_view_host()) { contents_->render_view_host()->ModalHTMLDialogClosed(sync_response_, json_retval); @@ -72,7 +72,7 @@ void ModalHtmlDialogDelegate::RemoveObserver() { NotificationService::current()->RemoveObserver( this, - NotificationType::WEB_CONTENTS_DISCONNECTED, - Source(contents_)); + NotificationType::TAB_CONTENTS_DISCONNECTED, + Source(contents_)); contents_ = NULL; // No longer safe to access. } -- cgit v1.1