| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "chrome/browser/chromeos/arc/arc_auth_service.h" | 5 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "ash/shelf/shelf_delegate.h" | 10 #include "ash/shelf/shelf_delegate.h" |
| (...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 ubertoken_fetcher_->StartFetchingToken(account_id_); | 665 ubertoken_fetcher_->StartFetchingToken(account_id_); |
| 666 } | 666 } |
| 667 | 667 |
| 668 void ArcAuthService::StartUI() { | 668 void ArcAuthService::StartUI() { |
| 669 DCHECK(thread_checker.Get().CalledOnValidThread()); | 669 DCHECK(thread_checker.Get().CalledOnValidThread()); |
| 670 | 670 |
| 671 SetState(State::FETCHING_CODE); | 671 SetState(State::FETCHING_CODE); |
| 672 | 672 |
| 673 if (initial_opt_in_) { | 673 if (initial_opt_in_) { |
| 674 initial_opt_in_ = false; | 674 initial_opt_in_ = false; |
| 675 ShowUI(UIPage::START, base::string16()); | 675 ShowUI(IsArcManaged() ? UIPage::LSO_PROGRESS : UIPage::START, |
| 676 base::string16()); |
| 676 } else if (context_prepared_) { | 677 } else if (context_prepared_) { |
| 677 CheckAndroidManagement(false); | 678 CheckAndroidManagement(false); |
| 678 } else { | 679 } else { |
| 679 PrepareContext(); | 680 PrepareContext(); |
| 680 } | 681 } |
| 681 } | 682 } |
| 682 | 683 |
| 683 void ArcAuthService::OnPrepareContextFailed() { | 684 void ArcAuthService::OnPrepareContextFailed() { |
| 684 DCHECK_EQ(state_, State::FETCHING_CODE); | 685 DCHECK_EQ(state_, State::FETCHING_CODE); |
| 685 | 686 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 757 return os << kStateFetchingCode; | 758 return os << kStateFetchingCode; |
| 758 case ArcAuthService::State::ACTIVE: | 759 case ArcAuthService::State::ACTIVE: |
| 759 return os << kStateActive; | 760 return os << kStateActive; |
| 760 default: | 761 default: |
| 761 NOTREACHED(); | 762 NOTREACHED(); |
| 762 return os; | 763 return os; |
| 763 } | 764 } |
| 764 } | 765 } |
| 765 | 766 |
| 766 } // namespace arc | 767 } // namespace arc |
| OLD | NEW |