diff options
| author | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-04 22:23:17 +0000 |
|---|---|---|
| committer | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-04 22:23:17 +0000 |
| commit | cac407bd57b7f7b3f9d85e1951a07d68f8400d0a (patch) | |
| tree | 60f20e4ef815964c4689f928134e645509c07249 /chrome/browser/browser_main.cc | |
| parent | 95ce68cc99b05ef26aa7b54bfb08a477960220aa (diff) | |
| download | chromium_src-cac407bd57b7f7b3f9d85e1951a07d68f8400d0a.zip chromium_src-cac407bd57b7f7b3f9d85e1951a07d68f8400d0a.tar.gz chromium_src-cac407bd57b7f7b3f9d85e1951a07d68f8400d0a.tar.bz2 | |
Refactoring master preference parsing code into installer util so
it can be shared by first run and set up. There is no functionality
change in this CL.
Review URL: http://codereview.chromium.org/9338
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 0da4522..c28edc8 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -345,10 +345,9 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command, local_state->SetBoolean(prefs::kMetricsReportingEnabled, true); // On first run, we need to process the master preferences before the // browser's profile_manager object is created. - FirstRun::MasterPrefResult master_pref_res = - FirstRun::ProcessMasterPreferences(user_data_dir, std::wstring()); first_run_ui_bypass = - (master_pref_res == FirstRun::MASTER_PROFILE_NO_FIRST_RUN_UI); + !FirstRun::ProcessMasterPreferences(user_data_dir, + std::wstring(), NULL); } ResourceBundle::InitSharedInstance( @@ -608,4 +607,3 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command, return result_code; } - |