diff options
| author | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 15:31:56 +0000 |
|---|---|---|
| committer | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 15:31:56 +0000 |
| commit | 43197ea26c3305cc42ba6a2e231f950bcac1e3d2 (patch) | |
| tree | e99f88d8787bc27e065c1c6bf3b98b97c4ab29fa /extensions | |
| parent | 3a9ab8f95dd88484a7d5c763819232142f6c916f (diff) | |
| download | chromium_src-43197ea26c3305cc42ba6a2e231f950bcac1e3d2.zip chromium_src-43197ea26c3305cc42ba6a2e231f950bcac1e3d2.tar.gz chromium_src-43197ea26c3305cc42ba6a2e231f950bcac1e3d2.tar.bz2 | |
Revert 222257 "Revert 222235 ""Redirecting URLs to Packaged Apps..."
Reason for revert: The first revert didn't actually fix the issues with the Chrome Frame net test failures, so I'm putting the patch back in.
> Revert 222235 ""Redirecting URLs to Packaged Apps" implementatio..."
>
> > "Redirecting URLs to Packaged Apps" implementation: revised
> >
> > Design proposal: https://docs.google.com/document/d/1r-RoOv2URfZBYrT_B6notQ6MeMqZRd1EP1AITuzJCAc/edit?usp=sharing
> >
> > * Support for url_handlers in manifest
> > * New kind of onLaunched event with navigation info in launch data
> > * Intercept/redirect top-level browser-initiated navigations (bookmarks, omnibox, etc.)
> > * Intercept/redirect top-frame navigations in tabs and app windows.
> >
> > This is a rework of https://codereview.chromium.org/22944002/.
> >
> > BUG=111422
> >
> > Review URL: https://chromiumcodereview.appspot.com/23847004
>
> Reason for revert:
> This is the most likely cause of the chrome_frame_net_tests failures (various tests), since no other changes in the blamelist were touching URLRequest bits.
>
> First failure here: http://build.chromium.org/p/chromium.win/builders/Chrome%20Frame%20Tests%20%28ie6%29/builds/46826
>
> TBR=sergeygs@chromium.org
>
> Review URL: https://codereview.chromium.org/23600025
TBR=stevet@chromium.org
Review URL: https://codereview.chromium.org/23597024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222258 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/common/manifest_constants.cc | 2 | ||||
| -rw-r--r-- | extensions/common/manifest_constants.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc index 0402c40..cc73f02 100644 --- a/extensions/common/manifest_constants.cc +++ b/extensions/common/manifest_constants.cc @@ -143,6 +143,8 @@ const char kTtsVoicesLang[] = "lang"; const char kTtsVoicesVoiceName[] = "voice_name"; const char kType[] = "type"; const char kUpdateURL[] = "update_url"; +const char kUrlHandlers[] = "url_handlers"; +const char kUrlHandlerTitle[] = "title"; const char kVersion[] = "version"; const char kWebAccessibleResources[] = "web_accessible_resources"; const char kWebURLs[] = "app.urls"; diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h index e08348e..de60410 100644 --- a/extensions/common/manifest_constants.h +++ b/extensions/common/manifest_constants.h @@ -148,6 +148,8 @@ namespace manifest_keys { extern const char kTtsVoicesVoiceName[]; extern const char kType[]; extern const char kUpdateURL[]; + extern const char kUrlHandlers[]; + extern const char kUrlHandlerTitle[]; extern const char kVersion[]; extern const char kWebAccessibleResources[]; extern const char kWebURLs[]; |