diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 18:44:19 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 18:44:19 +0000 |
| commit | bcc6518c163965f95d676c6dcb4f4dd256b89463 (patch) | |
| tree | 3a30903536efddcd2e48ef5902f2329efe76d36c /chrome/browser/browser_resources.grd | |
| parent | 9d6052a1a433df123732b517b6c683cf787c7181 (diff) | |
| download | chromium_src-bcc6518c163965f95d676c6dcb4f4dd256b89463.zip chromium_src-bcc6518c163965f95d676c6dcb4f4dd256b89463.tar.gz chromium_src-bcc6518c163965f95d676c6dcb4f4dd256b89463.tar.bz2 | |
chromeos: Make Chrome app a real app.
- Add a chrome_app component extension similar to web store;
- Remove ChromeAppItem and use the real app;
- Minor clean up;
- use_aura -> use_ash in browser_resources.grd;
- Fix style nits;
BUG=133015
TEST=Verify that "chrome" app is searchable.
Review URL: https://chromiumcodereview.appspot.com/10652003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index e26548a..d60979d 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -153,7 +153,7 @@ <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type="BINDATA" /> <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" /> <include name="IDR_ENTERPRISE_WEBSTORE_MANIFEST" file="resources\enterprise_webstore_app\manifest.json" type="BINDATA" /> - <if expr="pp_ifdef('use_aura')"> + <if expr="pp_ifdef('use_ash')"> <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_TASK_MANAGER_COMMANDS_JS" file="resources\task_manager\commands.js" type="BINDATA" /> <!-- The following defines.js uses flattenhtml feature to remove the platform-dependent code at complie-time. --> @@ -164,6 +164,7 @@ <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_TASK_MANAGER_MEASURE_TIME_JS" file="resources\task_manager\measure_time.js" type="BINDATA" /> <include name="IDR_TASK_MANAGER_MEASURE_TIME_END_JS" file="resources\task_manager\measure_time_end.js" type="BINDATA" /> + <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manifest.json" type="BINDATA" /> </if> <if expr="not pp_ifdef('chromeos')"> <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo.js" flattenhtml="true" type="BINDATA" /> @@ -208,14 +209,14 @@ <if expr="pp_ifdef('chromeos')"> <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\wallpaper_manager\manifest.json" type="BINDATA" /> </if> - <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura')"> + <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_ash')"> <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_modal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> </if> <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" /> </if> - <if expr="pp_ifdef('use_aura')"> + <if expr="pp_ifdef('use_ash')"> <include name="IDR_GESTURE_CONFIG_CSS" file="resources\gesture_config.css" type="BINDATA" /> <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.html" type="BINDATA" /> <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> |