chrome/browser/first_run.cc - Issue 155063: Merge r18210....

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

Issue 155063: Merge r18210.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/172/src/

Patch Set: Created 11 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:

Index: chrome/browser/first_run.cc

===================================================================

--- chrome/browser/first_run.cc (revision 19899)

+++ chrome/browser/first_run.cc (working copy)

@@ -310,6 +310,8 @@

import_items += HISTORY;

if (parse_result & installer_util::MASTER_PROFILE_IMPORT_BOOKMARKS)

import_items += FAVORITES;

+ if (parse_result & installer_util::MASTER_PROFILE_IMPORT_HOME_PAGE)

+ import_items += HOME_PAGE;

if (import_items) {

// There is something to import from the default browser. This launches

Property changes on: chrome\browser\first_run.cc

___________________________________________________________________

Modified: svn:mergeinfo

Merged /trunk/src/chrome/browser/first_run.cc:r18210,19692

« no previous file with comments | « no previous file | chrome/installer/util/google_chrome_distribution_unittest.cc » ('j') | no next file with comments »