diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 19:55:16 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 19:55:16 +0000 |
| commit | c4e52f0d8fa148f543d3e7b2562164e9bf5605aa (patch) | |
| tree | 86a455dd54d4542026ff3059ac939dc809a09b26 /chrome/browser/first_run_win.cc | |
| parent | 2fd94bbeefa87a83a96c65ff998add7d7fb0f908 (diff) | |
| download | chromium_src-c4e52f0d8fa148f543d3e7b2562164e9bf5605aa.zip chromium_src-c4e52f0d8fa148f543d3e7b2562164e9bf5605aa.tar.gz chromium_src-c4e52f0d8fa148f543d3e7b2562164e9bf5605aa.tar.bz2 | |
Use GetSwitchValueASCII.
BUG=24672
TEST=None
Original patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/296004
Review URL: http://codereview.chromium.org/373013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run_win.cc')
| -rw-r--r-- | chrome/browser/first_run_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc index f2ea99e8..fc2d8eb 100644 --- a/chrome/browser/first_run_win.cc +++ b/chrome/browser/first_run_win.cc @@ -504,7 +504,7 @@ class HungImporterMonitor : public WorkerThreadTicker::Callback { HWND owner_window_; base::ProcessHandle import_process_; WorkerThreadTicker ticker_; - DISALLOW_EVIL_CONSTRUCTORS(HungImporterMonitor); + DISALLOW_COPY_AND_ASSIGN(HungImporterMonitor); }; // This class is used by FirstRun::ImportNow to get notified of the outcome of @@ -541,7 +541,7 @@ class FirstRunImportObserver : public ImportObserver { bool loop_running_; int import_result_; - DISALLOW_EVIL_CONSTRUCTORS(FirstRunImportObserver); + DISALLOW_COPY_AND_ASSIGN(FirstRunImportObserver); }; std::wstring EncodeImportParams(int browser_type, int options, HWND window) { @@ -575,7 +575,7 @@ bool FirstRun::ImportSettings(Profile* profile, int browser_type, if (cmdline.HasSwitch(switches::kUserDataDir)) { import_cmd.AppendSwitchWithValue( switches::kUserDataDir, - cmdline.GetSwitchValue(switches::kUserDataDir)); + cmdline.GetSwitchValueASCII(switches::kUserDataDir)); } // Since ImportSettings is called before the local state is stored on disk |