diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 08:38:36 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 08:38:36 +0000 |
| commit | 3a3b75ab9cc13b9acb466de0ef1bc7036756fce4 (patch) | |
| tree | b58f4946657cc25dfc6f667e10aad16f070be5b4 /chrome/browser/ui/browser.cc | |
| parent | 75001aab2af6da7c04d30daf3019f0dba4982432 (diff) | |
| download | chromium_src-3a3b75ab9cc13b9acb466de0ef1bc7036756fce4.zip chromium_src-3a3b75ab9cc13b9acb466de0ef1bc7036756fce4.tar.gz chromium_src-3a3b75ab9cc13b9acb466de0ef1bc7036756fce4.tar.bz2 | |
Pass user gesture indicator for RPH and intents.
We are moving to a policy which will change where we show
RPH and web intents registrations between infobar and page-action
type indicator depending on factors like user gesture, previous
showing of the infobar, and perhaps other considerations. This
change gets that user gesture indicator to the policy logic.
It also incorporates a change to the web intents registration IPC
to pass the service info struct instead of individual members. (Adding
the user gesture went over the param limit, and passing the struct
is a good change regardless.)
R=groby@chromium.org,jam@chromium.org
BUG=119438
TEST=*WebIntent*.*
Review URL: https://chromiumcodereview.appspot.com/10447067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser.cc')
| -rw-r--r-- | chrome/browser/ui/browser.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 785af04..3d5c55c 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -186,6 +186,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/point.h" #include "webkit/glue/web_intent_data.h" +#include "webkit/glue/web_intent_service_data.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/window_open_disposition.h" #include "webkit/plugins/webplugininfo.h" @@ -2235,7 +2236,8 @@ void Browser::JSOutOfMemoryHelper(WebContents* tab) { void Browser::RegisterProtocolHandlerHelper(WebContents* tab, const std::string& protocol, const GURL& url, - const string16& title) { + const string16& title, + bool user_gesture) { TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents( tab); if (!tcw || tcw->profile()->IsOffTheRecord()) @@ -3601,17 +3603,16 @@ void Browser::JSOutOfMemory(WebContents* tab) { void Browser::RegisterProtocolHandler(WebContents* tab, const std::string& protocol, const GURL& url, - const string16& title) { - RegisterProtocolHandlerHelper(tab, protocol, url, title); + const string16& title, + bool user_gesture) { + RegisterProtocolHandlerHelper(tab, protocol, url, title, user_gesture); } -void Browser::RegisterIntentHandler(WebContents* tab, - const string16& action, - const string16& type, - const string16& href, - const string16& title, - const string16& disposition) { - RegisterIntentHandlerHelper(tab, action, type, href, title, disposition); +void Browser::RegisterIntentHandler( + WebContents* tab, + const webkit_glue::WebIntentServiceData& data, + bool user_gesture) { + RegisterIntentHandlerHelper(tab, data, user_gesture); } void Browser::WebIntentDispatch( |