chrome/browser/chrome_browser_main_win.cc - Issue 20483002: Merge 3 different ways of obtaining first run state into a single one.

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

Issue 20483002: Merge 3 different ways of obtaining first run state into a single one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge up to r214457 -- fix conflict with r214339 -- dcommit since tests pass on previous patch set Created 7 years, 5 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/chrome_browser_main_win.cc

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

index a2e3008e9096472a10846400a1f4b47b738aca10..cc7b6b6ea6ec28b19b64adf3fd2f4b615cd879fe 100644

--- a/chrome/browser/chrome_browser_main_win.cc

+++ b/chrome/browser/chrome_browser_main_win.cc

@@ -211,7 +211,8 @@ int ChromeBrowserMainPartsWin::PreCreateThreads() {

void ChromeBrowserMainPartsWin::PostMainMessageLoopRun() {

// Log the search engine chosen on first run. Do this at shutdown, after any

// changes are made from the first run bubble link, etc.

- if (do_first_run_tasks() && profile() && !profile()->IsOffTheRecord()) {

+ if (first_run::IsChromeFirstRun() && profile() &&

+ !profile()->IsOffTheRecord()) {

TemplateURLService* url_service =

TemplateURLServiceFactory::GetForProfile(profile());

const TemplateURL* default_search_engine =

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