chrome/browser/ui/webui/settings/md_settings_ui.cc - Issue 1575543003: Settings People Revamp: Implement parts of ChromeOS Change Picture

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/settings/md_settings_ui.cc

Issue 1575543003: Settings People Revamp: Implement parts of ChromeOS Change Picture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix change_picture_handler to accomodate origin/master changes Created 4 years, 11 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/ui/webui/settings/md_settings_ui.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc

index 6138db26c734f542933fe10510ba527bc607938b..3ace24271cc641730b1a45f6bbbeb84d7a7e7474 100644

--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc

@@ -26,9 +26,11 @@

#include "grit/settings_resources.h"

#include "grit/settings_resources_map.h"

-#if !defined(OS_CHROMEOS)

+#if defined(OS_CHROMEOS)

+#include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"

+#else // !defined(OS_CHROMEOS)

#include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"

-#endif

+#endif // defined(OS_CHROMEOS)

namespace settings {

@@ -50,7 +52,9 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)

AddSettingsPageUIHandler(new PeopleHandler(profile));

AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));

-#if !defined(OS_CHROMEOS)

+#if defined(OS_CHROMEOS)

+ AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());

+#else

AddSettingsPageUIHandler(new ManageProfileHandler(profile));

#endif

« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »