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

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

Issue 2561023002: arc: ARC loading progress should not be shown when started from OOBE. (Closed)
Patch Set: cleanup 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
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_SESSION_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <ostream> 9 #include <ostream>
10 #include <string> 10 #include <string>
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // and ArcAuthCodeFetcher. 202 // and ArcAuthCodeFetcher.
203 ArcAuthContext* auth_context() { return context_.get(); } 203 ArcAuthContext* auth_context() { return context_.get(); }
204 204
205 void StartArc(); 205 void StartArc();
206 206
207 void OnProvisioningFinished(ProvisioningResult result); 207 void OnProvisioningFinished(ProvisioningResult result);
208 208
209 void SetAttemptUserExitCallbackForTesting(const base::Closure& callback); 209 void SetAttemptUserExitCallbackForTesting(const base::Closure& callback);
210 210
211 private: 211 private:
212 enum class NegotiatorType {
213 DEFAULT,
214 OOBE,
215 };
216
212 // Negotiates the terms of service to user. 217 // Negotiates the terms of service to user.
213 void StartTermsOfServiceNegotiation(); 218 void StartTermsOfServiceNegotiation(NegotiatorType type);
214 void OnTermsOfServiceNegotiated(bool accepted); 219 void OnTermsOfServiceNegotiated(bool accepted);
215 220
216 void SetState(State state); 221 void SetState(State state);
217 void ShutdownBridge(); 222 void ShutdownBridge();
218 void OnOptInPreferenceChanged(); 223 void OnOptInPreferenceChanged();
219 void OnAndroidManagementPassed(); 224 void OnAndroidManagementPassed();
220 void OnArcDataRemoved(bool success); 225 void OnArcDataRemoved(bool success);
221 void OnArcSignInTimeout(); 226 void OnArcSignInTimeout();
222 void FetchAuthCode(); 227 void FetchAuthCode();
223 void PrepareContextForAuthCodeRequest(); 228 void PrepareContextForAuthCodeRequest();
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 DISALLOW_COPY_AND_ASSIGN(ArcSessionManager); 268 DISALLOW_COPY_AND_ASSIGN(ArcSessionManager);
264 }; 269 };
265 270
266 // Outputs the stringified |state| to |os|. This is only for logging purposes. 271 // Outputs the stringified |state| to |os|. This is only for logging purposes.
267 std::ostream& operator<<(std::ostream& os, 272 std::ostream& operator<<(std::ostream& os,
268 const ArcSessionManager::State& state); 273 const ArcSessionManager::State& state);
269 274
270 } // namespace arc 275 } // namespace arc
271 276
272 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_ 277 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698