OLD | NEW |
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/eula_screen.h" | 5 #include "chrome/browser/chromeos/login/eula_screen.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/chromeos/cros/cros_library.h" | 9 #include "chrome/browser/chromeos/cros/cros_library.h" |
10 #include "chrome/browser/chromeos/cros/cryptohome_library.h" | 10 #include "chrome/browser/chromeos/cros/cryptohome_library.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 if (!eula_page.empty()) | 59 if (!eula_page.empty()) |
60 return GURL(eula_page); | 60 return GURL(eula_page); |
61 | 61 |
62 VLOG(1) << "No eula found for locale: " << locale; | 62 VLOG(1) << "No eula found for locale: " << locale; |
63 } else { | 63 } else { |
64 LOG(ERROR) << "No manifest found."; | 64 LOG(ERROR) << "No manifest found."; |
65 } | 65 } |
66 return GURL(); | 66 return GURL(); |
67 } | 67 } |
68 | 68 |
69 void EulaScreen::OnExit(bool accepted, bool is_usage_stats_checked) { | 69 void EulaScreen::OnExit(bool accepted, |
70 get_screen_observer()->SetUsageStatisticsReporting(is_usage_stats_checked); | 70 bool usage_stats_enabled, |
| 71 bool rlz_enabled) { |
| 72 get_screen_observer()->SetUsageStatisticsReporting(usage_stats_enabled); |
| 73 get_screen_observer()->SetRlzEnabled(rlz_enabled); |
71 get_screen_observer()->OnExit(accepted | 74 get_screen_observer()->OnExit(accepted |
72 ? ScreenObserver::EULA_ACCEPTED | 75 ? ScreenObserver::EULA_ACCEPTED |
73 : ScreenObserver::EULA_BACK); | 76 : ScreenObserver::EULA_BACK); |
74 } | 77 } |
75 | 78 |
76 void EulaScreen::InitiatePasswordFetch() { | 79 void EulaScreen::InitiatePasswordFetch() { |
77 if (tpm_password_.empty()) { | 80 if (tpm_password_.empty()) { |
78 password_fetcher_.Fetch(); | 81 password_fetcher_.Fetch(); |
79 // Will call actor after password has been fetched. | 82 // Will call actor after password has been fetched. |
80 } else if (actor_) { | 83 } else if (actor_) { |
(...skipping 10 matching lines...) Expand all Loading... |
91 bool EulaScreen::IsUsageStatsEnabled() const { | 94 bool EulaScreen::IsUsageStatsEnabled() const { |
92 return get_screen_observer()->GetUsageStatisticsReporting(); | 95 return get_screen_observer()->GetUsageStatisticsReporting(); |
93 } | 96 } |
94 | 97 |
95 void EulaScreen::OnActorDestroyed(EulaScreenActor* actor) { | 98 void EulaScreen::OnActorDestroyed(EulaScreenActor* actor) { |
96 if (actor_ == actor) | 99 if (actor_ == actor) |
97 actor_ = NULL; | 100 actor_ = NULL; |
98 } | 101 } |
99 | 102 |
100 } // namespace chromeos | 103 } // namespace chromeos |
OLD | NEW |