summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-09 07:02:45 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-09 07:02:45 +0000
commit86ab823e7a9ce14fdf4afa389bb80d2eb175710f (patch)
tree803cd2e3acc0d22ad87f7f45f97dce78561c7fa3
parentc0b070339713c54e9a722a7fa434015f01b13db0 (diff)
downloadchromium_src-86ab823e7a9ce14fdf4afa389bb80d2eb175710f.zip
chromium_src-86ab823e7a9ce14fdf4afa389bb80d2eb175710f.tar.gz
chromium_src-86ab823e7a9ce14fdf4afa389bb80d2eb175710f.tar.bz2
Remove default apps for Chrome OS from public repository
BUG=chromium-os:6318 TEST=none Review URL: http://codereview.chromium.org/3353016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58917 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/default_extensions/chromeos/external_extensions.json22
-rw-r--r--chrome/chrome.gyp2
2 files changed, 1 insertions, 23 deletions
diff --git a/chrome/browser/extensions/default_extensions/chromeos/external_extensions.json b/chrome/browser/extensions/default_extensions/chromeos/external_extensions.json
deleted file mode 100644
index 380de4f..0000000
--- a/chrome/browser/extensions/default_extensions/chromeos/external_extensions.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "pjjhlfkghdhmijklfnahfkpgmhcmfgcm": {
- "name": "Reader",
- "external_update_url": "http://clients2.google.com/service/update2/crx"
- },
- "hhppicdlgmmialcogcpoejdankmfpgeo": {
- "name": "News",
- "external_update_url": "http://clients2.google.com/service/update2/crx"
- },
- "blpcfgokakmgnkcojhhkbfbldkacnbeo": {
- "name": "Youtube",
- "external_update_url": "http://clients2.google.com/service/update2/crx"
- },
- "ahcfofjeflnpmdchnleacfpljclhlkmd": {
- "name": "Plants vs Zombies",
- "external_update_url": "http://clients2.google.com/service/update2/crx"
- },
- "hoelgjfdglpmjhdcgpbacfkippplkcdd": {
- "name": "Darkroom",
- "external_update_url": "http://clients2.google.com/service/update2/crx"
- }
-}
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 22ca4f9..ffa0483 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -514,7 +514,7 @@
}
],
}],
- ['OS=="linux" and chromeos==1', {
+ ['OS=="linux" and chromeos==1 and branding=="Chrome"', {
'copies': [
{
'destination': '<(PRODUCT_DIR)/extensions',