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

chrome/browser/profiles/profile_shortcut_manager_win.h

Index: chrome/browser/profiles/profile_shortcut_manager_win.h
===================================================================
--- chrome/browser/profiles/profile_shortcut_manager_win.h	(revision 178353)
+++ chrome/browser/profiles/profile_shortcut_manager_win.h	(working copy)
@@ -5,6 +5,7 @@
 #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;
@@ -22,9 +23,21 @@
 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