chrome/common/extensions/extension.cc - Issue 11028121: Convert wallpaper picker to v2 app

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/extensions/extension.cc

Issue 11028121: Convert wallpaper picker to v2 app (Closed) Base URL: http://git.chromium.org/chromium/src.git@AppsV2

Patch Set: Created 8 years, 1 month 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/common/extensions/extension.cc

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc

index dc2711833084ebd275933dea2dc05eb6a08514eb..75264ffe6b95d49e78f376e511202ca28b7f3938 100644

--- a/chrome/common/extensions/extension.cc

+++ b/chrome/common/extensions/extension.cc

@@ -2664,8 +2664,7 @@ bool Extension::LoadChromeURLOverrides(string16* error) {

page != chrome::kChromeUIHistoryHost);

#if defined(OS_CHROMEOS)

is_override = (is_override &&

- page != chrome::kChromeUIActivationMessageHost &&

- page != chrome::kChromeUIWallpaperHost);

+ page != chrome::kChromeUIActivationMessageHost);

#endif

#if defined(FILE_MANAGER_EXTENSION)

is_override = (is_override &&