diff options
| author | gauravsh@chromium.org <gauravsh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 03:59:26 +0000 |
|---|---|---|
| committer | gauravsh@chromium.org <gauravsh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 03:59:26 +0000 |
| commit | 3d552e16b861cb4d37a020b924dda2f4fade036d (patch) | |
| tree | 017d608c39fff7a6ffded11e89a76be9c948cf01 /chrome/browser/browser_resources.grd | |
| parent | feacffb42dd257d527dbb92809da0ae6b185e11b (diff) | |
| download | chromium_src-3d552e16b861cb4d37a020b924dda2f4fade036d.zip chromium_src-3d552e16b861cb4d37a020b924dda2f4fade036d.tar.gz chromium_src-3d552e16b861cb4d37a020b924dda2f4fade036d.tar.bz2 | |
[Chrome OS ECHO] Add cookies permission to extension and change intent disposition to inline
In the new UX flow, we will use the inline WebIntent tab modal dialog for user consent instead of the Info Bar.
Also get rid of the actual extension code since it's been moved to
chromeos assets repository.
BUG=chromium-os:28353, chromium-os:27854, chromium-os:28484
TEST=make sure extension loads and handles intents correctly.
Review URL: http://codereview.chromium.org/9865016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 26ca190..01827b2 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -170,7 +170,6 @@ <include name="IDR_NETWORK_MENU_JS" file="resources\chromeos\network_menu.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\chromeos\notification_icon_link.html" type="BINDATA" /> <include name="IDR_OFFERS_MANIFEST" file="resources\chromeos\offers\manifest.json" type="BINDATA" /> - <include name="IDR_OFFERS_MAIN" file="resources\chromeos\offers\main.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_load.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_credits.html" flattenhtml="true" type="BINDATA" /> |