chrome/browser/ui/webui/options2/options_ui2.cc - Issue 10021066: Replace the index mapping of wallpaper picker UI and hard coded wallpaper index in C++

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/ui/webui/options2/options_ui2.cc

Issue 10021066: Replace the index mapping of wallpaper picker UI and hard coded wallpaper index in C++ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Nit Created 8 years, 8 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

« chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc ('K') | « chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/options_ui2.cc

diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui2.cc

index a0adc59a37286169a8ac600891949ef6c22dfe37..d733219eac64ee38e0f8b52ae4ff870e2ec78f96 100644

--- a/chrome/browser/ui/webui/options2/options_ui2.cc

+++ b/chrome/browser/ui/webui/options2/options_ui2.cc

@@ -75,6 +75,7 @@

#include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h"

#include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h"

#include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h"

+#include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h"

#if defined(USE_VIRTUAL_KEYBOARD)

#include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.h"

#endif

@@ -309,6 +310,11 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)

chromeos::options2::UserImageSource* user_image_source =

new chromeos::options2::UserImageSource();

profile->GetChromeURLDataManager()->AddDataSource(user_image_source);

+ // Set up the chrome://wallpaper/ source.

+ chromeos::options2::WallpaperThumbnailSource* wallpaper_thumbnail_source =

+ new chromeos::options2::WallpaperThumbnailSource();

+ profile->GetChromeURLDataManager()->

+ AddDataSource(wallpaper_thumbnail_source);

pointer_device_observer_.reset(

new chromeos::system::PointerDeviceObserver());