diff options
| author | noms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 03:30:38 +0000 |
|---|---|---|
| committer | noms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 03:30:38 +0000 |
| commit | de71ae9945e89ea1bf1eea94b3d3af9382febf68 (patch) | |
| tree | b39dbdd36433de74510abd7c6ac3fdf0fc0b27d6 /chrome/browser/first_run/first_run.cc | |
| parent | 703b7e15fc77b4f493bd1a808bd4ac02d7b8fbb0 (diff) | |
| download | chromium_src-de71ae9945e89ea1bf1eea94b3d3af9382febf68.zip chromium_src-de71ae9945e89ea1bf1eea94b3d3af9382febf68.tar.gz chromium_src-de71ae9945e89ea1bf1eea94b3d3af9382febf68.tar.bz2 | |
Refactor utility methods that don't use the ProfileManager directly out of the ProfileManager.
I only picked public, static, functions that look standalone
-- i.e. don't use any other functions in the ProfileManager,
and only interact with other classes (browser, file paths,
registry preferences)
BUG=none
TEST=existing unit and browser tests
Review URL: https://chromiumcodereview.appspot.com/18615010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run/first_run.cc')
| -rw-r--r-- | chrome/browser/first_run/first_run.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 9cb785b..c5cd11f 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -11,6 +11,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/lazy_instance.h" +#include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" @@ -28,7 +29,7 @@ #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/importer/importer_uma.h" #include "chrome/browser/importer/profile_writer.h" -#include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/profiles/profiles_state.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/shell_integration.h" @@ -167,14 +168,14 @@ void DoDelayedInstallExtensionsIfNeeded( base::FilePath GetDefaultPrefFilePath(bool create_profile_dir, const base::FilePath& user_data_dir) { base::FilePath default_pref_dir = - ProfileManager::GetDefaultProfileDir(user_data_dir); + profiles::GetDefaultProfileDir(user_data_dir); if (create_profile_dir) { if (!base::PathExists(default_pref_dir)) { if (!file_util::CreateDirectory(default_pref_dir)) return base::FilePath(); } } - return ProfileManager::GetProfilePrefsPath(default_pref_dir); + return profiles::GetProfilePrefsPath(default_pref_dir); } // Sets the |items| bitfield according to whether the import data specified by |