Merge 65079 - Remove component extensions Calendar and Docs...

chrome/browser/extensions/default_apps.cc

Index: chrome/browser/extensions/default_apps.cc
===================================================================
--- chrome/browser/extensions/default_apps.cc	(revision 65081)
+++ chrome/browser/extensions/default_apps.cc	(working copy)
@@ -19,10 +19,12 @@
 
 DefaultApps::DefaultApps(PrefService* prefs)
     : prefs_(prefs) {
+#if !defined(OS_CHROMEOS)
   // gmail, calendar, docs
   ids_.insert("pjkljhegncpnkpknbcohdijeoejaedia");
   ids_.insert("ejjicmeblgpmajnghnpcppodonldlgfn");
   ids_.insert("apdfllckaahabafndbhieahigkjlhalf");
+#endif  // OS_CHROMEOS

[Aaron Boodman, 2010/11/04 21:31:07]

One thing I just realized: I think that this will break the display of the app
store promo in Chrome OS. This is what was scaring me about having Chrome OS do
things differently.

:: despair ::

[Dmitry Polukhin, 2010/11/05 06:39:29]

Indeed, I don't see it anymore. I'll take a look how to return it back in Chrome
OS on Monday. Return it in R9x - it should be relatively easy.

I worked with apps in Chrome OS for long time, logged in with lots of new
profiles, etc. and noticed it only recently :) It is very unobtrusive. 

 }
 
 const ExtensionIdSet* DefaultApps::GetAppsToInstall() const {