chrome/common/temp_scaffolding_stubs.cc - Issue 165382: Merge 22284 - Refactoring of master preferences parsing before adding a new p...

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/common/temp_scaffolding_stubs.cc

Issue 165382: Merge 22284 - Refactoring of master preferences parsing before adding a new p... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/

Patch Set: Created 11 years, 4 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/common/temp_scaffolding_stubs.cc

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

--- chrome/common/temp_scaffolding_stubs.cc (revision 23178)

+++ chrome/common/temp_scaffolding_stubs.cc (working copy)

@@ -145,8 +145,8 @@

// static

bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,

const FilePath& master_prefs_path,

- int* preference_details,

- std::vector<std::wstring>* new_tabs) {

+ std::vector<std::wstring>* new_tabs,

+ int* ping_delay) {

// http://code.google.com/p/chromium/issues/detail?id=11971

// Pretend we processed them correctly.

return true;

Property changes on: chrome\common\temp_scaffolding_stubs.cc

___________________________________________________________________

Added: svn:mergeinfo

Merged /branches/chrome_webkit_merge_branch/chrome/common/temp_scaffolding_stubs.cc:r69-2775

Merged /trunk/src/chrome/common/temp_scaffolding_stubs.cc:r22284

« no previous file with comments | « chrome/browser/first_run_win.cc ('k') | chrome/installer/setup/install.h » ('j') | no next file with comments »