Revert 136573 - Extract StartupTabs and startup types from StartupBrowserCreator.

chrome/browser/profiles/profile_manager.h

 // 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.
 
 // This class keeps track of the currently-active profiles in the runtime.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/startup/startup_types.h"
+#include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/profiles/profile_shortcut_manager_win.h"
 #endif
 
 class NewProfileLauncher;
 class ProfileInfoCache;
 
@@ skipping 105 matching lines @@
   // otherwise return NULL.
   Profile* GetProfileByPath(const FilePath& path) const;
 
   // Activates a window for |profile|.  If no such window yet exists, or if
   // |always_create| is true, this first creates a new window, then activates
   // that. If activating an exiting window and multiple windows exists then the
   // window that was most recently active is activated. This is used for
   // creation of a window from the multi-profile dropdown menu.
   static void 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);
 
   // Profile::Delegate implementation:
   virtual void OnProfileCreated(Profile* profile,
                                 bool success,
                                 bool is_new_profile) OVERRIDE;
 
   // Add or remove a profile launcher to/from the list of launchers waiting for
   // new profiles to be created from the multi-profile menu.
   void AddProfileLauncher(NewProfileLauncher* profile_launcher);
@@ skipping 184 matching lines @@
 class ProfileManagerWithoutInit : public ProfileManager {
  public:
   explicit ProfileManagerWithoutInit(const FilePath& user_data_dir);
 
  protected:
   virtual void DoFinalInitForServices(Profile*, bool) OVERRIDE {}
   virtual void DoFinalInitLogging(Profile*) OVERRIDE {}
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_