Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Side by Side Diff: chrome/browser/first_run/first_run_internal_win.cc

Issue 19631004: Update include paths in chrome/browser/ for base/process changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge ToT Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/first_run/first_run_internal.h" 5 #include "chrome/browser/first_run/first_run_internal.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/process.h" 16 #include "base/process/kill.h"
17 #include "base/process_util.h" 17 #include "base/process/launch.h"
18 #include "base/process/process.h"
18 #include "base/threading/sequenced_worker_pool.h" 19 #include "base/threading/sequenced_worker_pool.h"
19 #include "base/time/time.h" 20 #include "base/time/time.h"
20 #include "base/win/metro.h" 21 #include "base/win/metro.h"
21 #include "chrome/common/chrome_constants.h" 22 #include "chrome/common/chrome_constants.h"
22 #include "chrome/common/chrome_paths.h" 23 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
24 #include "chrome/installer/util/google_update_settings.h" 25 #include "chrome/installer/util/google_update_settings.h"
25 #include "chrome/installer/util/install_util.h" 26 #include "chrome/installer/util/install_util.h"
26 #include "chrome/installer/util/master_preferences.h" 27 #include "chrome/installer/util/master_preferences.h"
27 #include "chrome/installer/util/master_preferences_constants.h" 28 #include "chrome/installer/util/master_preferences_constants.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 base::FilePath MasterPrefsPath() { 201 base::FilePath MasterPrefsPath() {
201 // The standard location of the master prefs is next to the chrome binary. 202 // The standard location of the master prefs is next to the chrome binary.
202 base::FilePath master_prefs; 203 base::FilePath master_prefs;
203 if (!PathService::Get(base::DIR_EXE, &master_prefs)) 204 if (!PathService::Get(base::DIR_EXE, &master_prefs))
204 return base::FilePath(); 205 return base::FilePath();
205 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs); 206 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
206 } 207 }
207 208
208 } // namespace internal 209 } // namespace internal
209 } // namespace first_run 210 } // namespace first_run
OLDNEW
« no previous file with comments | « chrome/browser/extensions/gtalk_extension_browsertest.cc ('k') | chrome/browser/first_run/upgrade_util_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698