chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h - Issue 676773002: Add device disabling to OOBE flow

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

Issue 676773002: Add device disabling to OOBE flow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update browser tests. Created 6 years, 2 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/screen_device_disabled.js ('k') | chrome/browser/ui/webui/chromeos/login/device_disabled_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/device_disabled_screen_handler.h

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

index 6696ed6f118e952f6a1791ecf33a5009f3d795de..f794b3ce47a0b92e1e69894605755f9be85de617 100644

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

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

@@ -5,6 +5,8 @@

#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DEVICE_DISABLED_SCREEN_HANDLER_H_

#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DEVICE_DISABLED_SCREEN_HANDLER_H_

+#include <string>

#include "base/macros.h"

#include "chrome/browser/chromeos/login/screens/device_disabled_screen_actor.h"

#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"

@@ -19,7 +21,7 @@ class DeviceDisabledScreenHandler : public DeviceDisabledScreenActor,

~DeviceDisabledScreenHandler() override;

// DeviceDisabledScreenActor:

- void Show() override;

+ void Show(const std::string& message) override;

void Hide() override;

void SetDelegate(Delegate* delegate) override;

@@ -36,6 +38,9 @@ class DeviceDisabledScreenHandler : public DeviceDisabledScreenActor,

// Indicates whether the screen should be shown right after initialization.

bool show_on_init_;

+ // The message to show to the user.

+ std::string message_;

DISALLOW_COPY_AND_ASSIGN(DeviceDisabledScreenHandler);

};