diff options
Diffstat (limited to 'content/browser')
4 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/intents/intent_injector.cc b/content/browser/intents/intent_injector.cc index 439ec19..65daff0 100644 --- a/content/browser/intents/intent_injector.cc +++ b/content/browser/intents/intent_injector.cc @@ -17,10 +17,10 @@ using content::WebContents; -IntentInjector::IntentInjector(TabContents* tab_contents) - : content::WebContentsObserver(tab_contents), +IntentInjector::IntentInjector(WebContents* web_contents) + : content::WebContentsObserver(web_contents), intents_dispatcher_(NULL) { - DCHECK(tab_contents); + DCHECK(web_contents); } IntentInjector::~IntentInjector() { diff --git a/content/browser/intents/intent_injector.h b/content/browser/intents/intent_injector.h index 8fc5833..e5e9896 100644 --- a/content/browser/intents/intent_injector.h +++ b/content/browser/intents/intent_injector.h @@ -28,8 +28,8 @@ struct WebIntentData; // when that TabContents is closed. class CONTENT_EXPORT IntentInjector : public content::WebContentsObserver { public: - // |tab_contents| must not be NULL. - explicit IntentInjector(TabContents* tab_contents); + // |web_contents| must not be NULL. + explicit IntentInjector(content::WebContents* web_contents); virtual ~IntentInjector(); // content::WebContentsObserver implementation. diff --git a/content/browser/intents/web_intents_dispatcher_impl.cc b/content/browser/intents/web_intents_dispatcher_impl.cc index 989cc3e..35b2c4c 100644 --- a/content/browser/intents/web_intents_dispatcher_impl.cc +++ b/content/browser/intents/web_intents_dispatcher_impl.cc @@ -27,7 +27,7 @@ const webkit_glue::WebIntentData& WebIntentsDispatcherImpl::GetIntent() { return intent_; } -void WebIntentsDispatcherImpl::DispatchIntent(TabContents* destination_tab) { +void WebIntentsDispatcherImpl::DispatchIntent(WebContents* destination_tab) { DCHECK(!intent_injector_); intent_injector_ = new IntentInjector(destination_tab); intent_injector_->SetIntent(this, intent_); diff --git a/content/browser/intents/web_intents_dispatcher_impl.h b/content/browser/intents/web_intents_dispatcher_impl.h index 321c65e..bfd4655 100644 --- a/content/browser/intents/web_intents_dispatcher_impl.h +++ b/content/browser/intents/web_intents_dispatcher_impl.h @@ -32,7 +32,7 @@ class WebIntentsDispatcherImpl : public content::WebIntentsDispatcher, // WebIntentsDispatcher implementation. virtual const webkit_glue::WebIntentData& GetIntent() OVERRIDE; - virtual void DispatchIntent(TabContents* destination_tab) OVERRIDE; + virtual void DispatchIntent(content::WebContents* destination_tab) OVERRIDE; virtual void SendReplyMessage(webkit_glue::WebIntentReplyType reply_type, const string16& data) OVERRIDE; virtual void RegisterReplyNotification(const base::Closure& closure) OVERRIDE; |