diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 01:09:27 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 01:09:27 +0000 |
| commit | 24358a960a9cd1630e7d8ae1d77c028cf1127ae7 (patch) | |
| tree | 0c56c6b09de8f64a544dd3fbe7a08378e48dbf82 | |
| parent | b06197956d4fc48712f8465a0cdfb428394f1074 (diff) | |
| download | chromium_src-24358a960a9cd1630e7d8ae1d77c028cf1127ae7.zip chromium_src-24358a960a9cd1630e7d8ae1d77c028cf1127ae7.tar.gz chromium_src-24358a960a9cd1630e7d8ae1d77c028cf1127ae7.tar.bz2 | |
Revert 141704 - Add Google Docs as a default app
R=asargent@chromium.org
BUG=114644
TEST=Docs should show up as a default app for new profiles
Review URL: https://chromiumcodereview.appspot.com/10535133
TBR=mihaip@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10673014
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@144346 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 6 | ||||
| -rw-r--r-- | chrome/browser/resources/default_apps/docs.crx | bin | 18830 -> 0 bytes | |||
| -rw-r--r-- | chrome/browser/resources/default_apps/external_extensions.json | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index aacda24..a5b58c4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -428,8 +428,8 @@ 'file_manager_extension%': 0, }], - ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', { - 'enable_one_click_signin%': 1, + ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', { + 'enable_one_click_signin%': 1, }], ['OS=="android"', { @@ -1178,14 +1178,12 @@ # is added or removed from the list, the chrome/browser/resources/ # default_apps/external_extensions.json file must also be updated. 'default_apps_list': [ - 'browser/resources/default_apps/docs.crx', 'browser/resources/default_apps/external_extensions.json', 'browser/resources/default_apps/gmail.crx', 'browser/resources/default_apps/search.crx', 'browser/resources/default_apps/youtube.crx', ], 'default_apps_list_linux_dest': [ - '<(PRODUCT_DIR)/default_apps/docs.crx', '<(PRODUCT_DIR)/default_apps/external_extensions.json', '<(PRODUCT_DIR)/default_apps/gmail.crx', '<(PRODUCT_DIR)/default_apps/search.crx', diff --git a/chrome/browser/resources/default_apps/docs.crx b/chrome/browser/resources/default_apps/docs.crx Binary files differdeleted file mode 100644 index 91b469c..0000000 --- a/chrome/browser/resources/default_apps/docs.crx +++ /dev/null diff --git a/chrome/browser/resources/default_apps/external_extensions.json b/chrome/browser/resources/default_apps/external_extensions.json index e4df021..a1303b3 100644 --- a/chrome/browser/resources/default_apps/external_extensions.json +++ b/chrome/browser/resources/default_apps/external_extensions.json @@ -18,10 +18,6 @@ "pjkljhegncpnkpknbcohdijeoejaedia" : { "external_crx": "gmail.crx", "external_version": "7" - }, - "apdfllckaahabafndbhieahigkjlhalf" : { - "external_crx": "docs.crx", - "external_version": "5.4" } } |