Revert 136573 - Extract StartupTabs and startup types from StartupBrowserCreator.

chrome/browser/profiles/profile_manager.cc

 // Copyright (c) 2012 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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/managed_mode.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #if defined(OS_WIN)
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 101 matching lines @@
 }
 
 // Called upon completion of profile creation. This function takes care of
 // launching a new browser window and signing the user in to their Google
 // account.
 void OnOpenWindowForNewProfile(Profile* profile,
                                Profile::CreateStatus status) {
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
     ProfileManager::FindOrCreateNewWindowForProfile(
         profile,
-        browser::startup::IS_PROCESS_STARTUP,
-        browser::startup::IS_FIRST_RUN,
+        StartupBrowserCreator::IS_PROCESS_STARTUP,
+        StartupBrowserCreator::IS_FIRST_RUN,
         false);
   }
 }
 
 } // namespace
 
 #if defined(ENABLE_SESSION_SERVICE)
 // static
 void ProfileManager::ShutdownSessionServices() {
   ProfileManager* pm = g_browser_process->profile_manager();
@@ skipping 297 matching lines @@
 }
 
 Profile* ProfileManager::GetProfileByPath(const FilePath& path) const {
   ProfilesInfoMap::const_iterator iter = profiles_info_.find(path);
   return (iter == profiles_info_.end()) ? NULL : iter->second->profile.get();
 }
 
 // static
 void ProfileManager::FindOrCreateNewWindowForProfile(
     Profile* profile,
-    browser::startup::IsProcessStartup process_startup,
-    browser::startup::IsFirstRun is_first_run,
+    StartupBrowserCreator::IsProcessStartup process_startup,
+    StartupBrowserCreator::IsFirstRun is_first_run,
     bool always_create) {
   DCHECK(profile);
 
   if (!always_create) {
     Browser* browser = BrowserList::FindTabbedBrowser(profile, false);
     if (browser) {
       browser->window()->Activate();
       return;
     }
   }
@@ skipping 482 matching lines @@
     AddProfileToCache(profile);
   }
 }
 
 void ProfileManager::RunCallbacks(const std::vector<CreateCallback>& callbacks,
                                   Profile* profile,
                                   Profile::CreateStatus status) {
   for (size_t i = 0; i < callbacks.size(); ++i)
     callbacks[i].Run(profile, status);
 }