summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbenwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-06 06:10:33 +0000
committerbenwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-06 06:10:33 +0000
commit2215c8d584dfc60ea6a88da11065f59e77021006 (patch)
tree8ae8c11a6441fca1c7824963a9e99dc6bfa6509c
parente61006e0070a6e73d86c65b5fb757d1d7929d13c (diff)
downloadchromium_src-2215c8d584dfc60ea6a88da11065f59e77021006.zip
chromium_src-2215c8d584dfc60ea6a88da11065f59e77021006.tar.gz
chromium_src-2215c8d584dfc60ea6a88da11065f59e77021006.tar.bz2
Fix command line for app shortcuts
The --profile-directory switch needs just the base name of the profile and does not work with the full path. BUG=136149 TEST=Check that creating shortcuts for apps (e.g. Scratchpad) creates shortcuts that work. Review URL: https://chromiumcodereview.appspot.com/10698113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145571 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/shell_integration.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index ee27074..519ded7 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -76,7 +76,8 @@ CommandLine ShellIntegration::CommandLineArgsForLauncher(
new_cmd_line.AppendSwitchPath(switches::kLoginProfile, profile);
#else
if (!profile_path.empty() && !extension_app_id.empty())
- new_cmd_line.AppendSwitchPath(switches::kProfileDirectory, profile_path);
+ new_cmd_line.AppendSwitchPath(switches::kProfileDirectory,
+ profile_path.BaseName());
#endif
// If |extension_app_id| is present, we use the kAppId switch rather than