Issue 594030: Fixes bad merge to 249.

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

Issue 594030: Fixes bad merge to 249. (Closed)

Created:
10 years, 10 months ago by sky

Modified:
9 years, 7 months ago

Reviewers:
Ben Goodger (Google)

CC:
chromium-reviews_googlegroups.com, ben+cc_chromium.org

Base URL:
svn://chrome-svn/chrome/branches/249/src/

Visibility:
Public.

Description

Fixes bad merge to 249. BUG=none TEST=none TBR=ben@chromium.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=38638

Patch Set 1 #

Created: 10 years, 10 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+1 line, -1 line)			Patch
	M	chrome/browser/browser_prefs.cc	View		1 chunk	+1 line, -1 line	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

Ben Goodger (Google)

10 years, 10 months ago (2010-02-10 20:44:51 UTC) #2

OK

On Wed, Feb 10, 2010 at 10:28 AM,  <sky@chromium.org> wrote:
> Reviewers: Ben Goodger,
>
> Description:
> Fixes bad merge to 249.
>
> BUG=none
> TEST=none
> TBR=ben@chromium.org
>
>
> Please review this at http://codereview.chromium.org/594030
>
> SVN Base: svn://chrome-svn/chrome/branches/249/src/
>
> Affected files:
>  M     chrome/browser/browser_prefs.cc
>
>
> Index: chrome/browser/browser_prefs.cc
> ===================================================================
> --- chrome/browser/browser_prefs.cc     (revision 38624)
> +++ chrome/browser/browser_prefs.cc     (working copy)
> @@ -72,10 +72,10 @@
>  #endif
>  #if defined(OS_WIN) || defined(OS_LINUX)
>   TaskManager::RegisterPrefs(local_state);
> +#endif
>  #if defined(OS_WIN)
>   CookiePromptModalDialog::RegisterPrefs(local_state);
>  #endif
> -}
>
>   // User prefs
>   SessionStartupPref::RegisterUserPrefs(user_prefs);
>
>
>

Expand Messages | Collapse Messages