Make profile shortcuts more sane when using --user-data-dir=.

chrome/browser/profiles/profile_shortcut_manager_win.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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_
 
+#include "base/command_line.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 
 class BrowserDistribution;
 
 // Internal free-standing functions that are exported here for testing.
 namespace profiles {
 namespace internal {
 
 // Name of the badged icon file generated for a given profile.
 extern const char kProfileIconFileName[];
 
 // Returns the default shortcut filename for the given profile name,
 // given |distribution|. Returns a filename appropriate for a
 // single-user installation if |profile_name| is empty.
 string16 GetShortcutFilenameForProfile(const string16& profile_name,
                                        BrowserDistribution* distribution);
 
-// Returns the command-line flags to launch Chrome with the given profile.
-string16 CreateProfileShortcutFlags(const FilePath& profile_path);
+// If a custom user data directory has been specified, returns its value.
+// Otherwise, returns an empty FilePath().
+FilePath GetCustomUserDataDirectory();
+
+// Creates a CommandLine that should be used for creating a non-profile
+// shortcut. This command line will either be empty or will have a user data
+// dir specified, when running with a custom one.
+CommandLine CreateCommandLineForNonProfileShortcut(const FilePath& chrome_exe);
+
+// Creates a CommandLine that should be used for creating a profile shortcut
+// for the given |profile_path|. When running with a custom user data dir, the
+// command line will include the appropriate user data dir flag.
+CommandLine CreateCommandLineForProfileShortcut(const FilePath& chrome_exe,
+                                                const FilePath& profile_path);
 
 }  // namespace internal
 }  // namespace profiles
 
 class ProfileShortcutManagerWin : public ProfileShortcutManager,
                                   public ProfileInfoCacheObserver {
  public:
   // Specifies whether a new shortcut should be created if none exist.
   enum CreateOrUpdateMode {
     UPDATE_EXISTING_ONLY,
@@ skipping 32 matching lines @@
   void CreateOrUpdateShortcutsForProfileAtPath(const FilePath& profile_path,
                                                CreateOrUpdateMode create_mode,
                                                NonProfileShortcutAction action);
 
   ProfileManager* profile_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileShortcutManagerWin);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_