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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 2507073002: Split ArcSessionManager from ArcAuthService. (Closed)
Patch Set: Fix rebase mistake Created 4 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
11 #include <string> 11 #include <string>
12 #include <utility> 12 #include <utility>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/callback_helpers.h" 16 #include "base/callback_helpers.h"
17 #include "base/command_line.h" 17 #include "base/command_line.h"
18 #include "base/location.h" 18 #include "base/location.h"
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/macros.h" 20 #include "base/macros.h"
21 #include "base/metrics/histogram_macros.h" 21 #include "base/metrics/histogram_macros.h"
22 #include "base/single_thread_task_runner.h" 22 #include "base/single_thread_task_runner.h"
23 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
24 #include "base/threading/thread_task_runner_handle.h" 24 #include "base/threading/thread_task_runner_handle.h"
25 #include "chrome/browser/browser_process.h" 25 #include "chrome/browser/browser_process.h"
26 #include "chrome/browser/browser_process_platform_part.h" 26 #include "chrome/browser/browser_process_platform_part.h"
27 #include "chrome/browser/chrome_notification_types.h" 27 #include "chrome/browser/chrome_notification_types.h"
28 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 28 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
29 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 29 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
30 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 30 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
31 #include "chrome/browser/chromeos/customization/customization_document.h" 31 #include "chrome/browser/chromeos/customization/customization_document.h"
32 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h" 32 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h"
33 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" 33 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
34 #include "chrome/browser/chromeos/login/existing_user_controller.h" 34 #include "chrome/browser/chromeos/login/existing_user_controller.h"
35 #include "chrome/browser/chromeos/login/helper.h" 35 #include "chrome/browser/chromeos/login/helper.h"
36 #include "chrome/browser/chromeos/login/hwid_checker.h" 36 #include "chrome/browser/chromeos/login/hwid_checker.h"
37 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h" 37 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h"
38 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h" 38 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
39 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h" 39 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h"
40 #include "chrome/browser/chromeos/login/screens/error_screen.h" 40 #include "chrome/browser/chromeos/login/screens/error_screen.h"
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 const Profile* profile = ProfileManager::GetActiveUserProfile(); 557 const Profile* profile = ProfileManager::GetActiveUserProfile();
558 558
559 const base::CommandLine* command_line = 559 const base::CommandLine* command_line =
560 base::CommandLine::ForCurrentProcess(); 560 base::CommandLine::ForCurrentProcess();
561 if (!command_line->HasSwitch(chromeos::switches::kEnableArcOOBEOptIn)) { 561 if (!command_line->HasSwitch(chromeos::switches::kEnableArcOOBEOptIn)) {
562 VLOG(1) << "Skip Arc Terms of Service screen because Arc OOBE OptIn is " 562 VLOG(1) << "Skip Arc Terms of Service screen because Arc OOBE OptIn is "
563 << "disabled."; 563 << "disabled.";
564 } else if (!user_manager::UserManager::Get()->IsUserLoggedIn()) { 564 } else if (!user_manager::UserManager::Get()->IsUserLoggedIn()) {
565 VLOG(1) << "Skip Arc Terms of Service screen because user is not " 565 VLOG(1) << "Skip Arc Terms of Service screen because user is not "
566 << "logged in."; 566 << "logged in.";
567 } else if (!arc::ArcAuthService::IsAllowedForProfile(profile)) { 567 } else if (!arc::ArcSessionManager::IsAllowedForProfile(profile)) {
568 VLOG(1) << "Skip Arc Terms of Service screen because Arc is not allowed."; 568 VLOG(1) << "Skip Arc Terms of Service screen because Arc is not allowed.";
569 } else if (profile->GetPrefs()->IsManagedPreference(prefs::kArcEnabled) && 569 } else if (profile->GetPrefs()->IsManagedPreference(prefs::kArcEnabled) &&
570 !profile->GetPrefs()->GetBoolean(prefs::kArcEnabled)) { 570 !profile->GetPrefs()->GetBoolean(prefs::kArcEnabled)) {
571 VLOG(1) << "Skip Arc Terms of Service screen because Arc is disabled."; 571 VLOG(1) << "Skip Arc Terms of Service screen because Arc is disabled.";
572 } else { 572 } else {
573 show_arc_terms = true; 573 show_arc_terms = true;
574 } 574 }
575 575
576 if (show_arc_terms) { 576 if (show_arc_terms) {
577 VLOG(1) << "Showing Arc Terms of Service screen."; 577 VLOG(1) << "Showing Arc Terms of Service screen.";
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1499 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1500 } 1500 }
1501 1501
1502 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1502 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1503 screen->SetParameters(effective_config, shark_controller_.get()); 1503 screen->SetParameters(effective_config, shark_controller_.get());
1504 SetStatusAreaVisible(true); 1504 SetStatusAreaVisible(true);
1505 SetCurrentScreen(screen); 1505 SetCurrentScreen(screen);
1506 } 1506 }
1507 1507
1508 } // namespace chromeos 1508 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698