More cleanup of DefaultApps code

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 391 matching lines @@
 
     std::string manifest =
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             iter->second).as_string();
     extensions_service_->register_component_extension(
         ExtensionService::ComponentExtensionInfo(manifest, path));
   }
 }
 
 void ProfileImpl::InstallDefaultApps() {
-  // The web store only supports en-US at the moment, so we don't install
-  // default apps in other locales.
-  if (g_browser_process->GetApplicationLocale() != "en-US")
+  ExtensionService* extension_service = GetExtensionService();
+  DefaultApps* default_apps = extension_service->default_apps();
+
+  if (!default_apps->ShouldInstallDefaultApps(extension_service->GetAppIds()))
     return;
 
-  ExtensionService* extensions_service = GetExtensionService();
-  const ExtensionIdSet* app_ids =
-      extensions_service->default_apps()->GetAppsToInstall();
-  if (!app_ids)
-    return;
-
-  for (ExtensionIdSet::const_iterator iter = app_ids->begin();
-       iter != app_ids->end(); ++iter) {
-    extensions_service->AddPendingExtensionFromDefaultAppList(*iter);
+  const ExtensionIdSet& app_ids = default_apps->default_apps();
+  for (ExtensionIdSet::const_iterator iter = app_ids.begin();
+       iter != app_ids.end(); ++iter) {
+    extension_service->AddPendingExtensionFromDefaultAppList(*iter);
   }
 }
 
 void ProfileImpl::InitWebResources() {
   if (web_resource_service_)
     return;
 
   web_resource_service_ = new WebResourceService(this);
   web_resource_service_->StartAfterDelay();
 }
@@ skipping 927 matching lines @@
 }
 
 PrerenderManager* ProfileImpl::GetPrerenderManager() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (!cl->HasSwitch(switches::kEnablePagePrerender))
     return NULL;
   if (!prerender_manager_.get())
     prerender_manager_.reset(new PrerenderManager(this));
   return prerender_manager_.get();
 }