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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141704 0039d316-1c4b-4281-b951-d872f2087c98

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"', {
@@ -1171,12 +1171,14 @@
     # 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',

chrome/browser/resources/default_apps/external_extensions.json

@@ -18,6 +18,10 @@
   "pjkljhegncpnkpknbcohdijeoejaedia" : {
     "external_crx": "gmail.crx",
     "external_version": "7"
+  },
+  "apdfllckaahabafndbhieahigkjlhalf" : {
+    "external_crx": "docs.crx",
+    "external_version": "5.4"
   }
 }