chrome/browser/ui/webui/options/chromeos/internet_options_handler.h - Issue 23447027: Merge 222390 "network_list.js should reflect the correct logged ..."

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/chromeos/internet_options_handler.h

Issue 23447027: Merge 222390 "network_list.js should reflect the correct logged ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1599/src/

Patch Set: Created 7 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/resources/options/chromeos/network_list.js ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.h

===================================================================

--- chrome/browser/ui/webui/options/chromeos/internet_options_handler.h (revision 222879)

+++ chrome/browser/ui/webui/options/chromeos/internet_options_handler.h (working copy)

@@ -10,6 +10,7 @@

#include "base/compiler_specific.h"

#include "base/memory/weak_ptr.h"

#include "chrome/browser/ui/webui/options/options_ui.h"

+#include "chromeos/login/login_state.h"

#include "chromeos/network/network_state_handler_observer.h"

#include "content/public/browser/notification_registrar.h"

#include "ui/gfx/native_widget_types.h"

@@ -36,7 +37,8 @@

// ChromeOS internet options page UI handler.

class InternetOptionsHandler

: public ::options::OptionsPageUIHandler,

- public chromeos::NetworkStateHandlerObserver {

+ public chromeos::NetworkStateHandlerObserver,

+ public chromeos::LoginState::Observer {

public:

InternetOptionsHandler();

virtual ~InternetOptionsHandler();

@@ -90,6 +92,13 @@

virtual void NetworkPropertiesUpdated(

const chromeos::NetworkState* network) OVERRIDE;

+ // chromeos::LoginState::Observer

+ virtual void LoggedInStateChanged(

+ chromeos::LoginState::LoggedInState) OVERRIDE;

+ // Updates the logged in user type.

+ void UpdateLoggedInUserType();

// content::NotificationObserver (from OptionsPageUIHandler)

virtual void Observe(int type,

const content::NotificationSource& source,