Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: chrome/browser/ui/browser.cc

Issue 8934011: Rename IntentsHost -> WebIntentsDispatcher and IntentsDispatcher -> WebIntentsHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/intents/web_intent_picker_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 0546c1351d1eaa01adfdbbc9f61eb595ba8085f7..d79f3115076e9b75c393a898fffd447e66d04869 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -153,11 +153,11 @@
#include "content/public/browser/devtools_manager.h"
#include "content/public/browser/download_item.h"
#include "content/public/browser/download_manager.h"
-#include "content/public/browser/intents_host.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/plugin_service.h"
#include "content/public/browser/user_metrics.h"
+#include "content/public/browser/web_intents_dispatcher.h"
#include "content/public/common/content_restriction.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/page_zoom.h"
@@ -3926,16 +3926,18 @@ void Browser::RegisterIntentHandler(TabContents* tab,
RegisterIntentHandlerHelper(tab, action, type, href, title, disposition);
}
-void Browser::WebIntentDispatch(TabContents* tab,
- content::IntentsHost* intents_host) {
+void Browser::WebIntentDispatch(
+ TabContents* tab, content::WebIntentsDispatcher* intents_dispatcher) {
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
return;
TabContentsWrapper* tcw =
TabContentsWrapper::GetCurrentWrapperForContents(tab);
- tcw->web_intent_picker_controller()->SetIntentsHost(intents_host);
+ tcw->web_intent_picker_controller()->SetIntentsDispatcher(intents_dispatcher);
tcw->web_intent_picker_controller()->ShowDialog(
- this, intents_host->GetIntent().action, intents_host->GetIntent().type);
+ this,
+ intents_dispatcher->GetIntent().action,
+ intents_dispatcher->GetIntent().type);
}
void Browser::FindReply(TabContents* tab,
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/intents/web_intent_picker_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698