chrome/browser/first_run/first_run.cc - Issue 7850026: Aura under Linux

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.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge conflict resolved Created 9 years, 3 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:

Index: chrome/browser/first_run/first_run.cc

diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc

index 205f12a82bc5e85189954d7da506417962242dc9..f08d28ceb2290511f8540db0e4c86f3401be80f5 100644

--- a/chrome/browser/first_run/first_run.cc

+++ b/chrome/browser/first_run/first_run.cc

@@ -319,7 +319,9 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,

installer::master_preferences::kDistroImportBookmarksFromFilePref,

&import_bookmarks_path);

-#if defined(OS_WIN)

+#if defined(USE_AURA)

+ // TODO(saintlou):

+#elif defined(OS_WIN)

if (!IsOrganicFirstRun()) {

// If search engines aren't explicitly imported, don't import.

if (!(out_prefs->do_import_items & importer::SEARCH_ENGINES)) {