Add desktop type context to most existing instances of FindTabbedBrowser.

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_
 
 #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/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/ui/browser_list_observer.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/startup/startup_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class NewProfileLauncher;
 class ProfileInfoCache;
 
 class ProfileManager : public base::NonThreadSafe,
                        public content::NotificationObserver,
                        public Profile::Delegate {
@@ skipping 97 matching lines @@
   static FilePath GetDefaultProfileDir(const FilePath& user_data_dir);
 
   // Returns the path to the preferences file given the user profile directory.
   static FilePath GetProfilePrefsPath(const FilePath& profile_dir);
 
   // If a profile with the given path is currently managed by this object,
   // return a pointer to the corresponding Profile object;
   // 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
+  // Activates a window for |profile| on the desktop specified by
+  // |desktop_type|. 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,
       chrome::startup::IsProcessStartup process_startup,
       chrome::startup::IsFirstRun is_first_run,
+      chrome::HostDesktopType desktop_type,
       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);
   void RemoveProfileLauncher(NewProfileLauncher* profile_launcher);
 
   // Creates a new profile in the next available multiprofile directory.
   // Directories are named "profile_1", "profile_2", etc., in sequence of
   // creation. (Because directories can be removed, however, it may be the case
   // that at some point the list of numbered profiles is not continuous.)
   static void CreateMultiProfileAsync(
       const string16& name,
       const string16& icon_url,
-      const CreateCallback& callback);
+      const CreateCallback& callback,
+      chrome::HostDesktopType desktop_type);
 
   // Register multi-profile related preferences in Local State.
   static void RegisterPrefs(PrefService* prefs);
 
   // Returns a ProfileInfoCache object which can be used to get information
   // about profiles without having to load them from disk.
   ProfileInfoCache& GetProfileInfoCache();
 
   // Returns a ProfileShortcut Manager that enables the caller to create
   // profile specfic desktop shortcuts.
   ProfileShortcutManager* profile_shortcut_manager();
 
   // Schedules the profile at the given path to be deleted on shutdown.
-  void ScheduleProfileForDeletion(const FilePath& profile_dir);
+  void ScheduleProfileForDeletion(const FilePath& profile_dir,
+                                  chrome::HostDesktopType desktop_type);
 
   // Checks if multiple profiles is enabled.
   static bool IsMultipleProfilesEnabled();
 
   // Autoloads profiles if they are running background apps.
   void AutoloadProfiles();
 
   // Register and add testing profile to the ProfileManager. Use ONLY in tests.
   // This allows the creation of Profiles outside of the standard creation path
   // for testing. If |addToCache|, add to ProfileInfoCache as well.
@@ skipping 142 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_