summaryrefslogtreecommitdiffstats
path: root/chrome/browser/shell_integration_linux.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 01:19:43 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 01:19:43 +0000
commit96690a420b73c1b5a4ae350a1a13963b90dabbec (patch)
tree7870d1347381cb41be4be98fa3a29ddd67629859 /chrome/browser/shell_integration_linux.cc
parent6ee15630603b46b24c02dcf4d4cf8b8412af52aa (diff)
downloadchromium_src-96690a420b73c1b5a4ae350a1a13963b90dabbec.zip
chromium_src-96690a420b73c1b5a4ae350a1a13963b90dabbec.tar.gz
chromium_src-96690a420b73c1b5a4ae350a1a13963b90dabbec.tar.bz2
Fix cases that initialized StringTokenizer with a temporary.
Fix examples in StringTokenizer header that recommended doing that. BUG=none TEST=on linux, open options, click proxy configuration button a bunch. It should not fail intermittently. Review URL: http://codereview.chromium.org/174490 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_linux.cc')
-rw-r--r--chrome/browser/shell_integration_linux.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 8ecc0da..ea38c57 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -54,7 +54,8 @@ bool GetDesktopShortcutTemplate(std::string* output) {
const char* xdg_data_dirs = getenv("XDG_DATA_DIRS");
if (xdg_data_dirs) {
- StringTokenizer tokenizer(xdg_data_dirs, ":");
+ CStringTokenizer tokenizer(xdg_data_dirs,
+ xdg_data_dirs + strlen(xdg_data_dirs), ":");
while (tokenizer.GetNext()) {
search_paths.push_back(tokenizer.token());
}