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

Unified Diff: chrome/browser/chromeos/arc/arc_auth_service.h

Issue 1892873002: Add CheckAndroidManagement to ARC sign-in flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@check_android_management
Patch Set: scoped_ptr->unique_ptr in test. Created 4 years, 8 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_auth_service.h
diff --git a/chrome/browser/chromeos/arc/arc_auth_service.h b/chrome/browser/chromeos/arc/arc_auth_service.h
index d797dfa2f749c6d2e254fa2b651e6cc25df6899d..d1c8b858a5c8ca7e9498cf29c7ea4254acba9938 100644
--- a/chrome/browser/chromeos/arc/arc_auth_service.h
+++ b/chrome/browser/chromeos/arc/arc_auth_service.h
@@ -6,22 +6,26 @@
#define CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_
#include <ostream>
+#include <string>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
xiyuan 2016/04/27 16:00:57 nit: move this to cc file if WrapUnique is used th
Polina Bondarenko 2016/04/27 16:06:35 Sorry, removed, no need in this header.
+#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
+#include "chrome/browser/chromeos/policy/android_management_client.h"
#include "components/arc/arc_bridge_service.h"
#include "components/arc/arc_service.h"
#include "components/arc/common/auth.mojom.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/syncable_prefs/pref_service_syncable_observer.h"
#include "components/syncable_prefs/synced_pref_observer.h"
-#include "google_apis/gaia/gaia_auth_consumer.h"
#include "google_apis/gaia/ubertoken_fetcher.h"
#include "mojo/public/cpp/bindings/binding.h"
class ArcAppLauncher;
class GaiaAuthFetcher;
class Profile;
+class ProfileOAuth2TokenService;
namespace content {
class StoragePartition;
@@ -89,6 +93,8 @@ class ArcAuthService : public ArcService,
// Checks if OptIn verification was disabled by switch in command line.
static bool IsOptInVerificationDisabled();
+ static void EnableCheckAndroidManagementForTesting();
+
void OnPrimaryUserProfilePrepared(Profile* profile);
void Shutdown();
@@ -160,6 +166,10 @@ class ArcAuthService : public ArcService,
void OnOptInPreferenceChanged();
void StartUI();
void OnPrepareContextFailed();
+ void StartAndroidManagementClient();
+ void CheckAndroidManagement();
+ void OnAndroidManagementChecked(
+ policy::AndroidManagementClient::Result result);
// Unowned pointer. Keeps current profile.
Profile* profile_ = nullptr;
@@ -183,6 +193,12 @@ class ArcAuthService : public ArcService,
UIPage ui_page_ = UIPage::NO_PAGE;
base::string16 ui_page_status_;
+ ProfileOAuth2TokenService* token_service_;
+ std::string account_id_;
+ std::unique_ptr<policy::AndroidManagementClient> android_management_client_;
+
+ base::WeakPtrFactory<ArcAuthService> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(ArcAuthService);
};

Powered by Google App Engine
This is Rietveld 408576698