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

chrome/browser/extensions/default_apps.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/default_apps.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 const int DefaultApps::kAppsPromoCounterMax = 10;
 
 // static
 void DefaultApps::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kDefaultAppsInstalled, false);
   prefs->RegisterIntegerPref(prefs::kAppsPromoCounter, 0);
 }
 
 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 {
   if (GetDefaultAppsInstalled())
     return NULL;
   else
     return &ids_;
 }
 
 const ExtensionIdSet* DefaultApps::GetDefaultApps() const {
@@ skipping 64 matching lines @@
 }
 
 bool DefaultApps::GetDefaultAppsInstalled() const {
   return prefs_->GetBoolean(prefs::kDefaultAppsInstalled);
 }
 
 void DefaultApps::SetDefaultAppsInstalled(bool val) {
   prefs_->SetBoolean(prefs::kDefaultAppsInstalled, val);
   prefs_->ScheduleSavePersistentPrefs();
 }