chrome/browser/first_run/first_run_linux.cc - Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/geolocation/access_token_store_browsertest.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/command_line.h"	7 #include "base/command_line.h"

8 #include "base/files/file_path.h"	8 #include "base/files/file_path.h"

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

10 #include "base/process_util.h"	10 #include "base/process_util.h"

11 #include "base/string_util.h"	11 #include "base/string_util.h"

12 #include "base/strings/string_piece.h"	12 #include "base/strings/string_piece.h"

13 #include "base/utf_string_conversions.h"	13 #include "base/strings/utf_string_conversions.h"

14 #include "chrome/browser/browser_process.h"	14 #include "chrome/browser/browser_process.h"

15 #include "chrome/browser/first_run/first_run_internal.h"	15 #include "chrome/browser/first_run/first_run_internal.h"

16 #include "chrome/browser/importer/importer_host.h"	16 #include "chrome/browser/importer/importer_host.h"

17 #include "chrome/browser/process_singleton.h"	17 #include "chrome/browser/process_singleton.h"

18 #include "chrome/browser/shell_integration.h"	18 #include "chrome/browser/shell_integration.h"

19 #include "chrome/common/chrome_switches.h"	19 #include "chrome/common/chrome_switches.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 "content/public/common/result_codes.h"	22 #include "content/public/common/result_codes.h"

23 #include "googleurl/src/gurl.h"	23 #include "googleurl/src/gurl.h"

(...skipping 10 matching lines...) Expand all Loading...
34 base::FilePath MasterPrefsPath() {	34 base::FilePath MasterPrefsPath() {

35 // The standard location of the master prefs is next to the chrome binary.	35 // The standard location of the master prefs is next to the chrome binary.

36 base::FilePath master_prefs;	36 base::FilePath master_prefs;

37 if (!PathService::Get(base::DIR_EXE, &master_prefs))	37 if (!PathService::Get(base::DIR_EXE, &master_prefs))

38 return base::FilePath();	38 return base::FilePath();

39 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);	39 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);

40 }	40 }

41	41

42 } // namespace internal	42 } // namespace internal

43 } // namespace first_run	43 } // namespace first_run

OLD	NEW