Rename IntentsHost -> WebIntentsDispatcher and IntentsDispatcher -> WebIntentsHost.

chrome/browser/ui/intents/web_intent_picker_controller.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_factory.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "content/browser/intents/intent_injector.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/public/browser/intents_host.h"
+#include "content/public/browser/web_intents_dispatcher.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "webkit/glue/web_intent_service_data.h"
 
 namespace {
 
 // Gets the favicon service for the profile in |tab_contents|.
 FaviconService* GetFaviconService(TabContentsWrapper* wrapper) {
   return wrapper->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
 }
@@ skipping 84 matching lines @@
   NavigationController* controller = &wrapper->tab_contents()->GetController();
   registrar_.Add(this, content::NOTIFICATION_LOAD_START,
                  content::Source<NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_TAB_CLOSING,
                  content::Source<NavigationController>(controller));
 }
 
 WebIntentPickerController::~WebIntentPickerController() {
 }
 
-void WebIntentPickerController::SetIntentsHost(
-    content::IntentsHost* intents_host) {
-  intents_host_.reset(intents_host);
-  intents_host_->RegisterReplyNotification(
+void WebIntentPickerController::SetIntentsDispatcher(
+    content::WebIntentsDispatcher* intents_dispatcher) {
+  intents_dispatcher_.reset(intents_dispatcher);
+  intents_dispatcher_->RegisterReplyNotification(
       base::Bind(&WebIntentPickerController::OnSendReturnMessage,
                  base::Unretained(this)));
 }
 
 void WebIntentPickerController::ShowDialog(Browser* browser,
                                            const string16& action,
                                            const string16& type) {
   if (picker_ != NULL)
     return;
 
@@ skipping 36 matching lines @@
                                    content::PAGE_TRANSITION_AUTO_BOOKMARK);
     params.disposition = NEW_FOREGROUND_TAB;
     params.profile = wrapper_->profile();
     browser::Navigate(&params);
     new_tab_contents = params.target_contents->tab_contents();
     service_tab_ = new_tab_contents;
 
     ClosePicker();
   }
 
-  intents_host_->DispatchIntent(new_tab_contents);
+  intents_dispatcher_->DispatchIntent(new_tab_contents);
 }
 
 void WebIntentPickerController::OnCancelled() {
-  if (!intents_host_.get())
+  if (!intents_dispatcher_.get())
     return;
 
   if (service_tab_) {
-    intents_host_->SendReplyMessage(webkit_glue::WEB_INTENT_SERVICE_TAB_CLOSED,
-                                    string16());
+    intents_dispatcher_->SendReplyMessage(
+        webkit_glue::WEB_INTENT_SERVICE_TAB_CLOSED, string16());
   } else {
-    intents_host_->SendReplyMessage(webkit_glue::WEB_INTENT_PICKER_CANCELLED,
-                                    string16());
+    intents_dispatcher_->SendReplyMessage(
+        webkit_glue::WEB_INTENT_PICKER_CANCELLED, string16());
   }
 
   ClosePicker();
 }
 
 void WebIntentPickerController::OnClosing() {
 }
 
 void WebIntentPickerController::OnSendReturnMessage() {
   ClosePicker();
@@ skipping 111 matching lines @@
     if (gfx::PNGCodec::Decode(favicon_data.image_data->front(),
                               favicon_data.image_data->size(),
                               &icon_bitmap)) {
       controller_->OnFaviconDataAvailable(index, icon_bitmap);
       return;
     }
   }
 
   controller_->OnFaviconDataUnavailable(index);
 }