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

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

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 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 5 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/shelf/shelf_delegate.h" 9 #include "ash/common/shelf/shelf_delegate.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 profile_->GetPrefs()->SetBoolean(prefs::kArcTermsAccepted, true); 774 profile_->GetPrefs()->SetBoolean(prefs::kArcTermsAccepted, true);
775 775
776 support_host_->ShowArcLoading(); 776 support_host_->ShowArcLoading();
777 StartArcAndroidManagementCheck(); 777 StartArcAndroidManagementCheck();
778 } 778 }
779 779
780 void ArcSessionManager::StartArcAndroidManagementCheck() { 780 void ArcSessionManager::StartArcAndroidManagementCheck() {
781 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 781 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
782 DCHECK(arc_bridge_service()->stopped()); 782 DCHECK(arc_bridge_service()->stopped());
783 DCHECK(state_ == State::SHOWING_TERMS_OF_SERVICE || 783 DCHECK(state_ == State::SHOWING_TERMS_OF_SERVICE ||
784 state_ == State::CHECKING_ANDROID_MANAGEMENT); 784 state_ == State::CHECKING_ANDROID_MANAGEMENT ||
785 (state_ == State::STOPPED &&
786 profile_->GetPrefs()->GetBoolean(prefs::kArcTermsAccepted)));
785 SetState(State::CHECKING_ANDROID_MANAGEMENT); 787 SetState(State::CHECKING_ANDROID_MANAGEMENT);
786 788
787 android_management_checker_.reset(new ArcAndroidManagementChecker( 789 android_management_checker_.reset(new ArcAndroidManagementChecker(
788 profile_, context_->token_service(), context_->account_id(), 790 profile_, context_->token_service(), context_->account_id(),
789 false /* retry_on_error */)); 791 false /* retry_on_error */));
790 android_management_checker_->StartCheck( 792 android_management_checker_->StartCheck(
791 base::Bind(&ArcSessionManager::OnAndroidManagementChecked, 793 base::Bind(&ArcSessionManager::OnAndroidManagementChecked,
792 weak_ptr_factory_.GetWeakPtr())); 794 weak_ptr_factory_.GetWeakPtr()));
793 } 795 }
794 796
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 return os << "ACTIVE"; 917 return os << "ACTIVE";
916 } 918 }
917 919
918 // Some compiler reports an error even if all values of an enum-class are 920 // Some compiler reports an error even if all values of an enum-class are
919 // covered indivisually in a switch statement. 921 // covered indivisually in a switch statement.
920 NOTREACHED(); 922 NOTREACHED();
921 return os; 923 return os;
922 } 924 }
923 925
924 } // namespace arc 926 } // namespace arc
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_support_host.h » ('j') | chrome/browser/chromeos/arc/arc_support_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698