arc: Restore Arc OptIn notification.

chrome/browser/chromeos/arc/arc_session_manager.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/arc/arc_auth_context.h"
+#include "chrome/browser/chromeos/arc/arc_auth_notification.h"
 #include "chrome/browser/chromeos/arc/arc_optin_uma.h"
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_negotiator.h"
 #include "chrome/browser/chromeos/arc/policy/arc_android_management_checker.h"
 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
@@ skipping 441 matching lines @@
 void ArcSessionManager::OnIsSyncingChanged() {
   sync_preferences::PrefServiceSyncable* const pref_service_syncable =
       PrefServiceSyncableFromProfile(profile_);
   if (!pref_service_syncable->IsSyncing())
     return;
 
   pref_service_syncable->RemoveObserver(this);
 
   if (IsArcEnabled())
     OnOptInPreferenceChanged();
+
+  if (!g_disable_ui_for_testing &&
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(

[khmel, 2016/12/20 18:48:44]

New in this CL, don't show notification if Arc OOBE OptIn is active. This means
user was already prompted.

+          chromeos::switches::kEnableArcOOBEOptIn) &&
+      profile_->IsNewProfile() &&
+      !profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled)) {
+    ArcAuthNotification::Show(profile_);
+  }
 }
 
 void ArcSessionManager::Shutdown() {
+  if (!g_disable_ui_for_testing)

[khmel, 2016/12/20 18:48:44]

There is no CloseUI equivalent that was in previous impl. Make sure notification
is closed on shutdown.

[xiyuan, 2016/12/20 19:00:06]

nit: Do we need this condition? Think we can always call
ArcAuthNotification::Hide() here.

[khmel, 2016/12/20 19:13:12]

Thank you for pointing this. Agree that there is a temptation to remove this.
However message_center::MessageCenter is not available by default   in
unit_tests. We can address this issue later and probably add some unit tests
(however making Arc OptIn OOBE persistent would deprecate this). Considering
this urgent for M56 let merge it now.

[xiyuan, 2016/12/20 19:14:23]

Acknowledged.

+    ArcAuthNotification::Hide();
+
   ShutdownBridge();
   if (support_host_) {
     support_host_->Close();
     support_host_->RemoveObserver(this);
     support_host_.reset();
   }
   if (profile_) {
     sync_preferences::PrefServiceSyncable* pref_service_syncable =
         PrefServiceSyncableFromProfile(profile_);
     pref_service_syncable->RemoveObserver(this);
@@ skipping 38 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(profile_);
 
   // TODO(dspaid): Move code from OnSyncedPrefChanged into this method.
   OnSyncedPrefChanged(prefs::kArcEnabled, IsArcManaged());
 
   const bool arc_enabled = IsArcEnabled();
   for (auto& observer : observer_list_)
     observer.OnArcOptInChanged(arc_enabled);
 
+  // Hide auth notification if it was opened before and arc.enabled pref was
+  // explicitly set to true or false.
+  if (!g_disable_ui_for_testing &&
+      profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled)) {

[khmel, 2016/12/20 18:48:44]

There is no CloseUI equivalent that was in previous impl. Make sure notification
is closed on explicit user's action.

+    ArcAuthNotification::Hide();
+  }
+
   if (!arc_enabled) {
     // Reset any pending request to re-enable Arc.
     reenable_arc_ = false;
     StopArc();
     RemoveArcData();
     return;
   }
 
   if (state_ == State::ACTIVE)
     return;
@@ skipping 372 matching lines @@
       return os << "ACTIVE";
   }
 
   // Some compiler reports an error even if all values of an enum-class are
   // covered indivisually in a switch statement.
   NOTREACHED();
   return os;
 }
 
 }  // namespace arc