diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 17:56:26 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 17:56:26 +0000 |
| commit | b9d5116ffa1b1ce23e865bef50c84d75059d4150 (patch) | |
| tree | 8b465ec67e7865509fcb4454ad5c2f3e9fee932a /content | |
| parent | d0e59079317b29705a05690bb73a2f6d0186dbba (diff) | |
| download | chromium_src-b9d5116ffa1b1ce23e865bef50c84d75059d4150.zip chromium_src-b9d5116ffa1b1ce23e865bef50c84d75059d4150.tar.gz chromium_src-b9d5116ffa1b1ce23e865bef50c84d75059d4150.tar.bz2 | |
Merge 177395
> Add incoming intent page transition modifier for Android.
>
> It is useful for Chrome on Android to be able to determine whether a
> page transition originated from an incoming intent, so that we can
> ensure that we don't intercept such requests with the
> InterceptNavigationResourceThrottle.
>
> BUG=143118
>
>
> Review URL: https://chromiumcodereview.appspot.com/11439032
TBR=jknotten@chromium.org
Review URL: https://codereview.chromium.org/12090022
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@179160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/public/common/page_transition_types_list.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/content/public/common/page_transition_types_list.h b/content/public/common/page_transition_types_list.h index 8a5bc76..3f7076c 100644 --- a/content/public/common/page_transition_types_list.h +++ b/content/public/common/page_transition_types_list.h @@ -109,6 +109,9 @@ PAGE_TRANSITION(FROM_ADDRESS_BAR, 0x02000000) // User is navigating to the home page. PAGE_TRANSITION(HOME_PAGE, 0x04000000) +// The transition originated from an incoming intent. (Android only) +PAGE_TRANSITION(FROM_INTENT, 0x08000000) + // The beginning of a navigation chain. PAGE_TRANSITION(CHAIN_START, 0x10000000) |