Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1518)

Unified Diff: chrome/browser/chromeos/arc/arc_support_host.cc

Issue 2561023002: arc: ARC loading progress should not be shown when started from OOBE. (Closed)
Patch Set: comments addresses Created 4 years 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
Index: chrome/browser/chromeos/arc/arc_support_host.cc
diff --git a/chrome/browser/chromeos/arc/arc_support_host.cc b/chrome/browser/chromeos/arc/arc_support_host.cc
index 3941d5d756972a5d970c68fec2cc95d10f7507dd..f81d52e567f9ecb4f795905ebc61f472532c1bbb 100644
--- a/chrome/browser/chromeos/arc/arc_support_host.cc
+++ b/chrome/browser/chromeos/arc/arc_support_host.cc
@@ -206,7 +206,11 @@ void ArcSupportHost::ShowLso() {
ShowPage(UIPage::LSO);
}
-void ArcSupportHost::ShowArcLoading() {
+void ArcSupportHost::ShowArcLoading(bool force_activate) {
+ if (!force_activate && !message_host_) {
hidehiko 2016/12/20 15:20:45 Please do not depend on message_host_. It's life t
khmel 2016/12/20 16:27:58 Please see code below, L 219, where absent of mess
+ ui_page_ = UIPage::ARC_LOADING;
+ return;
+ }
ShowPage(UIPage::ARC_LOADING);
}
@@ -533,8 +537,8 @@ void ArcSupportHost::OnMessage(const base::DictionaryValue& message) {
message.GetBoolean(kIsLocationServiceEnabled,
&is_location_service_enabled)) {
for (auto& observer : observer_list_) {
- observer.OnTermsAgreed(is_metrics_enabled, is_backup_restore_enabled,
- is_location_service_enabled);
+ observer.OnTermsAccepted(is_metrics_enabled, is_backup_restore_enabled,
+ is_location_service_enabled);
}
} else {
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698