chrome/browser/first_run/first_run.h - Issue 12094026: Skip a first-run import on Mac when there is nothing left to import.

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

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

Issue 12094026: Skip a first-run import on Mac when there is nothing left to import. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove fragile check 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

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 d289c957cba6b1cce635175bbc606fda87e32d6d..970cdd452e4dea22ca79dae71cda59384ee883ff 100644

--- a/chrome/browser/first_run/first_run.h

+++ b/chrome/browser/first_run/first_run.h

@@ -135,6 +135,9 @@ int ImportNow(Profile* profile, const CommandLine& cmdline);

// Returns the path for the master preferences file.

FilePath MasterPrefsPath();

+// Set a master preferences file path that overrides platform defaults.

+void SetMasterPrefsPathForTesting(const 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

// location and processes it so it becomes the default preferences in the

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