chrome/browser/ui/webui/chromeos/login/update_screen_handler.h - Issue 7774009: [cros] check for updates in WebUI OOBE can be cancelled in dev builds.

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/update_screen_handler.h

Issue 7774009: [cros] check for updates in WebUI OOBE can be cancelled in dev builds. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Added OnActorDestroyed to UpdateScreen::Delegate. Created 9 years, 4 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/resources/chromeos/login/oobe_screen_update.js ('k') | chrome/browser/ui/webui/chromeos/login/update_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/update_screen_handler.h

diff --git a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h

index 9071cb38185f781ab498dab148563757a7f858f1..ab179a6712ec84cf498119ecd7203b93743fc069 100644

--- a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h

+++ b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h

@@ -21,6 +21,7 @@ class UpdateScreenHandler : public UpdateScreenActor,

virtual void Initialize();

// UpdateScreenActor implementation:

+ virtual void SetDelegate(UpdateScreenActor::Delegate* screen) OVERRIDE;

virtual void Show();

virtual void Hide();

virtual void PrepareToShow();

@@ -33,6 +34,12 @@ class UpdateScreenHandler : public UpdateScreenActor,

virtual void RegisterMessages();

private:

+#if !defined(OFFICIAL_BUILD)

+ // Called when user presses Escape to cancel update.

+ void HandleUpdateCancel(const base::ListValue* args);

+#endif

+ UpdateScreenActor::Delegate* screen_;

// Keeps whether screen should be shown right after initialization.

bool show_on_init_;