summaryrefslogtreecommitdiffstats
path: root/content/browser/tab_contents
diff options
context:
space:
mode:
authorgbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 21:50:58 +0000
committergbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 21:50:58 +0000
commit8b5af49028869646e046a0615dec0c553a3771ee (patch)
tree9859da02a1c45e62133fae75837a7b472c1f1176 /content/browser/tab_contents
parent3ab8d81b7e34403f8e4636aa2bc3b3b218332c0b (diff)
downloadchromium_src-8b5af49028869646e046a0615dec0c553a3771ee.zip
chromium_src-8b5af49028869646e046a0615dec0c553a3771ee.tar.gz
chromium_src-8b5af49028869646e046a0615dec0c553a3771ee.tar.bz2
Fix the RenderViewImpl to adapt to the Chromium API change for Web Intents.
R=jhawkins@chromium.org BUG=None TEST=None Review URL: http://codereview.chromium.org/8631014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tab_contents')
-rw-r--r--content/browser/tab_contents/tab_contents.cc6
-rw-r--r--content/browser/tab_contents/tab_contents.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 3c8f247..13e8ff4 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -283,8 +283,8 @@ bool TabContents::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
bool message_is_ok = true;
IPC_BEGIN_MESSAGE_MAP_EX(TabContents, message, message_is_ok)
- IPC_MESSAGE_HANDLER(IntentsHostMsg_RegisterIntentHandler,
- OnRegisterIntentHandler)
+ IPC_MESSAGE_HANDLER(IntentsHostMsg_RegisterIntentService,
+ OnRegisterIntentService)
IPC_MESSAGE_HANDLER(IntentsHostMsg_WebIntentDispatch,
OnWebIntentDispatch)
IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartProvisionalLoadForFrame,
@@ -901,7 +901,7 @@ void TabContents::SetContentRestrictions(int restrictions) {
delegate()->ContentRestrictionsChanged(this);
}
-void TabContents::OnRegisterIntentHandler(const string16& action,
+void TabContents::OnRegisterIntentService(const string16& action,
const string16& type,
const string16& href,
const string16& title,
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 846a8f5..d4c8d8e 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -597,7 +597,7 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
friend class TestTabContents;
// Message handlers.
- void OnRegisterIntentHandler(const string16& action,
+ void OnRegisterIntentService(const string16& action,
const string16& type,
const string16& href,
const string16& title,