chrome/browser/first_run/first_run_posix.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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

« no previous file with comments | « chrome/browser/first_run/first_run_browsertest.cc ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »

OLD	NEW
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.h"	5 #include "chrome/browser/first_run/first_run.h"

6	6

7 #include "base/path_service.h"	7 #include "base/path_service.h"

	8 #include "base/prefs/pref_service.h"

8 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/first_run/first_run_internal.h"	11 #include "chrome/browser/first_run/first_run_internal.h"

11 #include "chrome/browser/importer/importer_host.h"	12 #include "chrome/browser/importer/importer_host.h"

12 #include "chrome/browser/importer/importer_list.h"	13 #include "chrome/browser/importer/importer_list.h"

13 #include "chrome/browser/importer/importer_progress_dialog.h"	14 #include "chrome/browser/importer/importer_progress_dialog.h"

14 #include "chrome/browser/importer/importer_progress_observer.h"	15 #include "chrome/browser/importer/importer_progress_observer.h"

15 #include "chrome/browser/prefs/pref_service.h"

16 #include "chrome/browser/profiles/profile_manager.h"	16 #include "chrome/browser/profiles/profile_manager.h"

17 #include "chrome/common/chrome_constants.h"	17 #include "chrome/common/chrome_constants.h"

18 #include "chrome/common/chrome_paths.h"	18 #include "chrome/common/chrome_paths.h"

19 #include "chrome/common/pref_names.h"	19 #include "chrome/common/pref_names.h"

20 #include "chrome/installer/util/google_update_settings.h"	20 #include "chrome/installer/util/google_update_settings.h"

21 #include "chrome/installer/util/master_preferences.h"	21 #include "chrome/installer/util/master_preferences.h"

22 #include "chrome/installer/util/master_preferences_constants.h"	22 #include "chrome/installer/util/master_preferences_constants.h"

23	23

24 namespace {	24 namespace {

25	25

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
145 namespace first_run {	145 namespace first_run {

146	146

147 // TODO(port): Import switches need to be ported to both Mac and Linux. Not all	147 // TODO(port): Import switches need to be ported to both Mac and Linux. Not all

148 // import switches here are implemented for Linux. None are implemented for Mac	148 // import switches here are implemented for Linux. None are implemented for Mac

149 // (as this function will not be called on Mac).	149 // (as this function will not be called on Mac).

150 int ImportNow(Profile* profile, const CommandLine& cmdline) {	150 int ImportNow(Profile* profile, const CommandLine& cmdline) {

151 return internal::ImportBookmarkFromFileIfNeeded(profile, cmdline);	151 return internal::ImportBookmarkFromFileIfNeeded(profile, cmdline);

152 }	152 }

153	153

154 } // namespace first_run	154 } // namespace first_run

OLD	NEW