chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h - Issue 2561023002: arc: ARC loading progress should not be shown when started from OOBE.

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

Issue 2561023002: arc: ARC loading progress should not be shown when started from OOBE. (Closed)

Patch Set: refactored Created 3 years, 11 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

« chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.cc ('K') | « chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc ('k') | chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc » ('j') | chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h

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

index 0b171707a2500192d40643ef1867f6fa8b8fbcad..406e064f08e8cf6c781a6f195a99d54dcc65646f 100644

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

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

@@ -9,6 +9,7 @@

#include <string>

#include "base/macros.h"

+#include "base/observer_list.h"

#include "chrome/browser/chromeos/arc/optin/arc_optin_preference_handler_observer.h"

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

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

@@ -38,7 +39,8 @@ class ArcTermsOfServiceScreenHandler :

::login::LocalizedValuesBuilder* builder) override;

// ArcTermsOfServiceScreenActor:

- void SetDelegate(Delegate* screen) override;

+ void AddObserver(ArcTermsOfServiceScreenActorObserver* observer) override;

+ void RemoveObserver(ArcTermsOfServiceScreenActorObserver* observer) override;

void Show() override;

void Hide() override;

@@ -60,7 +62,7 @@ class ArcTermsOfServiceScreenHandler :

void OnBackupAndRestoreModeChanged(bool enabled, bool managed) override;

void OnLocationServicesModeChanged(bool enabled, bool managed) override;

- Delegate* screen_ = nullptr;

+ base::ObserverList<ArcTermsOfServiceScreenActorObserver> observer_list_;

hidehiko 2017/01/30 10:12:36 Can this be check_empty = true for better graceful

khmel 2017/01/31 02:47:09 Done.

// Whether the screen should be shown right after initialization.

bool show_on_init_ = false;