chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc - Issue 2713513009: cros: Break BaseScreenHandler into two classes.

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/chromeos/login/user_image_screen_handler.cc

Issue 2713513009: cros: Break BaseScreenHandler into two classes. (Closed)

Patch Set: Add comments, fix compile Created 3 years, 10 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

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

index c1d48412e78a6a6bc3ef178bdc29888502a566be..d313a595f6b17a80fa652321018692ddbb3a3389 100644

--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

@@ -38,7 +38,8 @@ const char kJsScreenPath[] = "login.UserImageScreen";

namespace chromeos {

-UserImageScreenHandler::UserImageScreenHandler() {

+UserImageScreenHandler::UserImageScreenHandler()

+ : BaseScreenHandler(kScreenId) {

set_call_js_prefix(kJsScreenPath);

ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();

media::SoundsManager* manager = media::SoundsManager::Get();

@@ -76,7 +77,7 @@ void UserImageScreenHandler::Show() {

return;

}

screen_show_time_ = base::Time::Now();

- ShowScreen(OobeScreen::SCREEN_USER_IMAGE_PICKER);

+ ShowScreen(kScreenId);

// When shown, query camera presence.

if (screen_ && is_ready_)