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

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

Issue 2615793002: arc: Fix situation when ARC cannot be disabled safely. (Closed)
Patch Set: 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
Index: chrome/browser/chromeos/arc/arc_session_manager.cc
diff --git a/chrome/browser/chromeos/arc/arc_session_manager.cc b/chrome/browser/chromeos/arc/arc_session_manager.cc
index 3544f007a7645d368c16cdb8ec58aa1cd3f15a64..b8be63d605e1c76aa26266b3ccb12bd572d3a6b8 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager.cc
@@ -287,6 +287,12 @@ void ArcSessionManager::OnProvisioningFinished(ProvisioningResult result) {
// and |State::Active| is not guaranteed to be set here.
// prefs::kArcDataRemoveRequested also can be active for now.
+ if (!IsArcEnabled()) {
hidehiko 2017/01/05 08:18:02 This check does not work in more complicated situa
khmel 2017/01/05 22:55:53 Done.
+ LOG(WARNING) << " Provisioning result received after Arc was disabled. "
hidehiko 2017/01/05 08:18:02 Please remove a space between '"' and P. Ditto for
khmel 2017/01/05 22:55:53 The reason of this situation is the same as for li
+ << " Ignoring result " << static_cast<int>(result) << ".";
+ return;
+ }
+
if (provisioning_reported_) {
// We don't expect ProvisioningResult::SUCCESS is reported twice or reported
// after an error.
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_support_host.cc » ('j') | chrome/browser/chromeos/arc/arc_support_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698