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

Unified Diff: chrome/browser/first_run/first_run.h

Issue 12163003: Add FilePath to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/webstore_installer.h ('k') | chrome/browser/first_run/first_run_internal.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/first_run/first_run.h
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index 970cdd452e4dea22ca79dae71cda59384ee883ff..cf93bcf467b59e471dcb4930f987034abb895c58 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -17,12 +17,15 @@
#include "ui/gfx/native_widget_types.h"
class CommandLine;
-class FilePath;
class GURL;
class PrefServiceSyncable;
class Profile;
class ProcessSingleton;
+namespace base {
+class FilePath;
+}
+
// This namespace contains the chrome first-run installation actions needed to
// fully test the custom installer. It also contains the opposite actions to
// execute during uninstall. When the first run UI is ready we won't
@@ -133,10 +136,10 @@ void DoPostImportTasks(Profile* profile, bool make_chrome_default);
int ImportNow(Profile* profile, const CommandLine& cmdline);
// Returns the path for the master preferences file.
-FilePath MasterPrefsPath();
+base::FilePath MasterPrefsPath();
// Set a master preferences file path that overrides platform defaults.
-void SetMasterPrefsPathForTesting(const FilePath& master_prefs);
+void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs);
// The master preferences is a JSON file with the same entries as the
// 'Default\Preferences' file. This function locates this file from a standard
@@ -152,7 +155,7 @@ void SetMasterPrefsPathForTesting(const FilePath& master_prefs);
// See chrome/installer/util/master_preferences.h for a description of
// 'master_preferences' file.
ProcessMasterPreferencesResult ProcessMasterPreferences(
- const FilePath& user_data_dir,
+ const base::FilePath& user_data_dir,
MasterPrefs* out_prefs);
// Show the first run search engine bubble at the first appropriate opportunity.
« no previous file with comments | « chrome/browser/extensions/webstore_installer.h ('k') | chrome/browser/first_run/first_run_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698