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

Side by Side Diff: chrome/browser/chromeos/arc/arc_auth_service.h

Issue 2556273002: [Merge-M56] arc: Fix double provisioning failure reporting. (Closed)
Patch Set: resolve conflicts 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_auth_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_
6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_ 6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <ostream> 9 #include <ostream>
10 #include <string> 10 #include <string>
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 Profile* profile_ = nullptr; 284 Profile* profile_ = nullptr;
285 285
286 // Registrar used to monitor ARC enabled state. 286 // Registrar used to monitor ARC enabled state.
287 PrefChangeRegistrar pref_change_registrar_; 287 PrefChangeRegistrar pref_change_registrar_;
288 288
289 mojo::Binding<AuthHost> binding_; 289 mojo::Binding<AuthHost> binding_;
290 State state_ = State::NOT_INITIALIZED; 290 State state_ = State::NOT_INITIALIZED;
291 base::ObserverList<Observer> observer_list_; 291 base::ObserverList<Observer> observer_list_;
292 std::unique_ptr<ArcAppLauncher> playstore_launcher_; 292 std::unique_ptr<ArcAppLauncher> playstore_launcher_;
293 bool reenable_arc_ = false; 293 bool reenable_arc_ = false;
294 bool provisioning_reported_ = false;
294 base::OneShotTimer arc_sign_in_timer_; 295 base::OneShotTimer arc_sign_in_timer_;
295 296
296 // Notifies the correct callback whenever the auth_code is ready. 297 // Notifies the correct callback whenever the auth_code is ready.
297 std::unique_ptr<AccountInfoNotifier> account_info_notifier_; 298 std::unique_ptr<AccountInfoNotifier> account_info_notifier_;
298 299
299 // Temporarily keeps the ArcSupportHost instance. 300 // Temporarily keeps the ArcSupportHost instance.
300 // This should be moved to ArcSessionManager when the refactoring is 301 // This should be moved to ArcSessionManager when the refactoring is
301 // done. 302 // done.
302 std::unique_ptr<ArcSupportHost> support_host_; 303 std::unique_ptr<ArcSupportHost> support_host_;
303 // Handles preferences and metrics mode. 304 // Handles preferences and metrics mode.
(...skipping 10 matching lines...) Expand all
314 315
315 DISALLOW_COPY_AND_ASSIGN(ArcAuthService); 316 DISALLOW_COPY_AND_ASSIGN(ArcAuthService);
316 }; 317 };
317 318
318 // Outputs the stringified |state| to |os|. This is only for logging purposes. 319 // Outputs the stringified |state| to |os|. This is only for logging purposes.
319 std::ostream& operator<<(std::ostream& os, const ArcAuthService::State& state); 320 std::ostream& operator<<(std::ostream& os, const ArcAuthService::State& state);
320 321
321 } // namespace arc 322 } // namespace arc
322 323
323 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_ 324 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_auth_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698