chrome/browser/resources/options2/options_bundle.js - Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui…

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/resources/options2/options_bundle.js

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Merge to trunk Created 8 years, 9 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/browser/resources/options2/options_bundle.js

diff --git a/chrome/browser/resources/options2/options_bundle.js b/chrome/browser/resources/options2/options_bundle.js

index 01f975bd4ac79a8f69c808ce33e199a108ce7a7f..16d75cd986ce8747aee56467892cc33665178fee 100644

--- a/chrome/browser/resources/options2/options_bundle.js

+++ b/chrome/browser/resources/options2/options_bundle.js

@@ -42,6 +42,10 @@

var KeyboardOverlay = options.KeyboardOverlay;

var PointerOverlay = options.PointerOverlay;

</if>

+<if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">

+ <include src="chromeos/set_wallpaper_options.js"></include>

+ var SetWallpaperOptions = options.SetWallpaperOptions;

+</if>

« no previous file with comments | « chrome/browser/resources/options2/options.js ('k') | chrome/browser/ui/webui/options2/browser_options_handler2.cc » ('j') | no next file with comments »