diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 22:47:10 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 22:47:10 +0000 |
| commit | f805fe8d565caf479ea438adfd1cd9a0f58b52ab (patch) | |
| tree | a61a57f2dfde431a618aaf91517fa49842490278 /chrome/browser/process_singleton_win.cc | |
| parent | 7bbb2fcc93f8231f1a1e744bd1b57adf4df9a518 (diff) | |
| download | chromium_src-f805fe8d565caf479ea438adfd1cd9a0f58b52ab.zip chromium_src-f805fe8d565caf479ea438adfd1cd9a0f58b52ab.tar.gz chromium_src-f805fe8d565caf479ea438adfd1cd9a0f58b52ab.tar.bz2 | |
Make BrowserInit use FilePath instead of wstring for current directory.
(A.k.a. shaving a yak to get rid of a FromWStringHack().)
BUG=24672
TEST=builds
Review URL: http://codereview.chromium.org/3064032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton_win.cc')
| -rw-r--r-- | chrome/browser/process_singleton_win.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index 90fcf20..52c7a96 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -8,6 +8,7 @@ #include "app/win_util.h" #include "base/base_paths.h" #include "base/command_line.h" +#include "base/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/scoped_handle.h" @@ -251,8 +252,8 @@ LRESULT ProcessSingleton::OnCopyData(HWND hwnd, const COPYDATASTRUCT* cds) { } // Get current directory. - const std::wstring cur_dir = - msg.substr(first_null + 1, second_null - first_null); + const FilePath cur_dir(msg.substr(first_null + 1, + second_null - first_null)); const std::wstring::size_type third_null = msg.find_first_of(L'\0', second_null + 1); |