Merge 48149 - Relanding 48042....

chrome/browser/profile.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/profile.h"
 
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/env_var.h"
@@ skipping 742 matching lines @@
 #if defined(OS_CHROMEOS) && defined(GOOGLE_CHROME_BUILD)
   // Chat manager.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableChatManager)) {
     component_extensions["chat_manager"] = IDR_CHAT_MANAGER_MANIFEST;
   }
 #endif
 
   // Some sample apps to make our lives easier while we are developing extension
   // apps. This way we don't have to constantly install these over and over.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps)) {
+  if (Extension::AppsAreEnabled()) {
 #if defined(OS_WIN)
     std::string user_domain;
     if (base::EnvVarGetter::Create()->GetEnv("USERDOMAIN", &user_domain) &&
         user_domain == "GOOGLE") {
       component_extensions["gmail_app"] = IDR_GMAIL_APP_MANIFEST;
       component_extensions["calendar_app"] = IDR_CALENDAR_APP_MANIFEST;
       component_extensions["docs_app"] = IDR_DOCS_APP_MANIFEST;
     }
 #endif
   }
@@ skipping 736 matching lines @@
                                  CommandLine::ForCurrentProcess()));
   sync_service_.reset(
       profile_sync_factory_->CreateProfileSyncService());
   sync_service_->Initialize();
 }
 
 void ProfileImpl::InitCloudPrintProxyService() {
   cloud_print_proxy_service_.reset(new CloudPrintProxyService(this));
   cloud_print_proxy_service_->Initialize();
 }