chrome/browser/ui/webui/options/browser_options_handler.h - Issue 493613002: Add an enrolling state for consumer management section in settings page.

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/options/browser_options_handler.h

Issue 493613002: Add an enrolling state for consumer management section in settings page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dn

Patch Set: Fixed broken browser tests. Created 6 years, 3 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/signin_screen_handler.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/browser_options_handler.h

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h

index 0c65c886ea4dd38974e0f89c2597059f3c4b72bf..9a79d55b37e3fef3e83aba61af4ed9ef8a407d7b 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.h

+++ b/chrome/browser/ui/webui/options/browser_options_handler.h

@@ -29,6 +29,7 @@

#include "ui/shell_dialogs/select_file_dialog.h"

#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/policy/consumer_management_service.h"

#include "chrome/browser/chromeos/system/pointer_device_observer.h"

#endif // defined(OS_CHROMEOS)

@@ -56,6 +57,7 @@ class BrowserOptionsHandler

public ShellIntegration::DefaultWebClientObserver,

#if defined(OS_CHROMEOS)

public chromeos::system::PointerDeviceObserver::Observer,

+ public policy::ConsumerManagementService::Observer,

#endif

public TemplateURLServiceObserver,

public extensions::ExtensionRegistryObserver,

@@ -129,6 +131,9 @@ class BrowserOptionsHandler

// Will be called when powerwash dialog is shown.

void OnPowerwashDialogShow(const base::ListValue* args);

+ // ConsumerManagementService::Observer:

+ virtual void OnConsumerManagementStatusChanged() OVERRIDE;

#endif

void UpdateSyncState();