OLD | NEW |
---|---|
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_support_host.h" | 5 #include "chrome/browser/chromeos/arc/arc_support_host.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "ash/common/system/chromeos/devicetype_utils.h" | 9 #include "ash/common/system/chromeos/devicetype_utils.h" |
10 #include "base/i18n/timezone.h" | 10 #include "base/i18n/timezone.h" |
11 #include "base/json/json_reader.h" | 11 #include "base/json/json_reader.h" |
12 #include "base/json/json_writer.h" | 12 #include "base/json/json_writer.h" |
13 #include "base/threading/thread_task_runner_handle.h" | 13 #include "base/threading/thread_task_runner_handle.h" |
14 #include "base/values.h" | 14 #include "base/values.h" |
15 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
16 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 16 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
17 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 17 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
18 #include "chrome/browser/metrics/metrics_reporting_state.h" | 18 #include "chrome/browser/metrics/metrics_reporting_state.h" |
19 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 20 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
21 #include "chrome/browser/ui/browser_commands.h" | 21 #include "chrome/browser/ui/browser_commands.h" |
22 #include "chrome/common/pref_names.h" | |
22 #include "chrome/grit/generated_resources.h" | 23 #include "chrome/grit/generated_resources.h" |
23 #include "components/metrics/metrics_pref_names.h" | 24 #include "components/metrics/metrics_pref_names.h" |
24 #include "components/prefs/pref_service.h" | 25 #include "components/prefs/pref_service.h" |
25 #include "components/user_manager/known_user.h" | 26 #include "components/user_manager/known_user.h" |
26 #include "ui/base/l10n/l10n_util.h" | 27 #include "ui/base/l10n/l10n_util.h" |
27 #include "ui/base/webui/web_ui_util.h" | 28 #include "ui/base/webui/web_ui_util.h" |
28 | 29 |
29 namespace { | 30 namespace { |
30 const char kAction[] = "action"; | 31 const char kAction[] = "action"; |
32 const char kBackupRestoreEnabled[] = "backupRestoreEnabled"; | |
33 const char kCanEnable[] = "canEnable"; | |
31 const char kCode[] = "code"; | 34 const char kCode[] = "code"; |
32 const char kCanEnable[] = "canEnable"; | |
33 const char kStatus[] = "status"; | |
34 const char kData[] = "data"; | 35 const char kData[] = "data"; |
35 const char kDeviceId[] = "deviceId"; | 36 const char kDeviceId[] = "deviceId"; |
37 const char kEnabled[] = "enabled"; | |
36 const char kOn[] = "on"; | 38 const char kOn[] = "on"; |
37 const char kPage[] = "page"; | 39 const char kPage[] = "page"; |
40 const char kStatus[] = "status"; | |
38 const char kText[] = "text"; | 41 const char kText[] = "text"; |
39 const char kActionInitialize[] = "initialize"; | 42 const char kActionInitialize[] = "initialize"; |
40 const char kActionSetMetricsMode[] = "setMetricsMode"; | 43 const char kActionSetMetricsMode[] = "setMetricsMode"; |
41 const char kActionStartLso[] = "startLso"; | 44 const char kActionStartLso[] = "startLso"; |
42 const char kActionCancelAuthCode[] = "cancelAuthCode"; | 45 const char kActionCancelAuthCode[] = "cancelAuthCode"; |
43 const char kActionSetAuthCode[] = "setAuthCode"; | 46 const char kActionSetAuthCode[] = "setAuthCode"; |
44 const char kActionEnableMetrics[] = "enableMetrics"; | 47 const char kActionEnableMetrics[] = "enableMetrics"; |
45 const char kActionSendFeedback[] = "sendFeedback"; | 48 const char kActionSendFeedback[] = "sendFeedback"; |
49 const char kActionSetBackupRestore[] = "setBackupRestore"; | |
46 const char kActionCloseUI[] = "closeUI"; | 50 const char kActionCloseUI[] = "closeUI"; |
47 const char kActionShowPage[] = "showPage"; | 51 const char kActionShowPage[] = "showPage"; |
48 } // namespace | 52 } // namespace |
49 | 53 |
50 // static | 54 // static |
51 const char ArcSupportHost::kHostName[] = "com.google.arc_support"; | 55 const char ArcSupportHost::kHostName[] = "com.google.arc_support"; |
52 | 56 |
53 // static | 57 // static |
54 const char ArcSupportHost::kHostAppId[] = "cnbgggchhmkkdmeppjobngjoejnihlei"; | 58 const char ArcSupportHost::kHostAppId[] = "cnbgggchhmkkdmeppjobngjoejnihlei"; |
55 | 59 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
91 SendMetricsMode(); | 95 SendMetricsMode(); |
92 | 96 |
93 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); | 97 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); |
94 DCHECK(arc_auth_service); | 98 DCHECK(arc_auth_service); |
95 OnOptInUIShowPage(arc_auth_service->ui_page(), | 99 OnOptInUIShowPage(arc_auth_service->ui_page(), |
96 arc_auth_service->ui_page_status()); | 100 arc_auth_service->ui_page_status()); |
97 } | 101 } |
98 | 102 |
99 void ArcSupportHost::Initialize() { | 103 void ArcSupportHost::Initialize() { |
100 DCHECK(client_); | 104 DCHECK(client_); |
101 | |
102 std::unique_ptr<base::DictionaryValue> localized_strings( | 105 std::unique_ptr<base::DictionaryValue> localized_strings( |
103 new base::DictionaryValue()); | 106 new base::DictionaryValue()); |
104 base::string16 device_name = ash::GetChromeOSDeviceName(); | 107 base::string16 device_name = ash::GetChromeOSDeviceName(); |
105 localized_strings->SetString( | 108 localized_strings->SetString( |
106 "greetingHeader", | 109 "greetingHeader", |
107 l10n_util::GetStringFUTF16(IDS_ARC_OPT_IN_DIALOG_HEADER, device_name)); | 110 l10n_util::GetStringFUTF16(IDS_ARC_OPT_IN_DIALOG_HEADER, device_name)); |
108 localized_strings->SetString( | 111 localized_strings->SetString( |
109 "greetingDescription", | 112 "greetingDescription", |
110 l10n_util::GetStringFUTF16(IDS_ARC_OPT_IN_DIALOG_DESCRIPTION, | 113 l10n_util::GetStringFUTF16(IDS_ARC_OPT_IN_DIALOG_DESCRIPTION, |
111 device_name)); | 114 device_name)); |
(...skipping 14 matching lines...) Expand all Loading... | |
126 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_PROGRESS_LSO)); | 129 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_PROGRESS_LSO)); |
127 localized_strings->SetString( | 130 localized_strings->SetString( |
128 "progressAndroidLoading", | 131 "progressAndroidLoading", |
129 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_PROGRESS_ANDROID)); | 132 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_PROGRESS_ANDROID)); |
130 localized_strings->SetString( | 133 localized_strings->SetString( |
131 "authorizationFailed", | 134 "authorizationFailed", |
132 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_AUTHORIZATION_FAILED)); | 135 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_AUTHORIZATION_FAILED)); |
133 localized_strings->SetString( | 136 localized_strings->SetString( |
134 "termsOfService", | 137 "termsOfService", |
135 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_TERMS_OF_SERVICE)); | 138 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_TERMS_OF_SERVICE)); |
139 localized_strings->SetString( | |
140 "textBackupRestore", | |
141 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_BACKUP_RESTORE)); | |
136 | 142 |
137 const std::string& app_locale = g_browser_process->GetApplicationLocale(); | 143 const std::string& app_locale = g_browser_process->GetApplicationLocale(); |
138 const std::string& country_code = base::CountryCodeForCurrentTimezone(); | 144 const std::string& country_code = base::CountryCodeForCurrentTimezone(); |
139 localized_strings->SetString("countryCode", country_code); | 145 localized_strings->SetString("countryCode", country_code); |
140 | 146 |
141 webui::SetLoadTimeDataDefaults(app_locale, localized_strings.get()); | |
142 | 147 |
143 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); | 148 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); |
149 | |
150 localized_strings->SetBoolean( | |
elijahtaylor1
2016/06/30 01:59:06
We want the default to be checked, and set the pre
malaykeshav
2016/06/30 02:46:19
What about the case where the opt-in fails. Do we
elijahtaylor1
2016/06/30 04:52:34
That's a good point, and I do think it's the right
malaykeshav
2016/06/30 18:25:46
This is already set when defining the boolean pref
khmel
2016/06/30 18:30:11
BTW, if OptIn fails, 'Get Started' page is not sho
xiyuan
2016/06/30 18:34:22
What about user disables ARC then re-enables it in
malaykeshav
2016/06/30 18:50:59
The user's choice persists across the disable-rena
khmel
2016/06/30 19:00:43
I also still think that
pref_change_registrar_.A
| |
151 kBackupRestoreEnabled, | |
152 arc_auth_service->profile()->GetPrefs()->GetBoolean( | |
153 prefs::kArcBackupRestoreEnabled)); | |
154 | |
155 webui::SetLoadTimeDataDefaults(app_locale, localized_strings.get()); | |
144 DCHECK(arc_auth_service); | 156 DCHECK(arc_auth_service); |
145 const std::string device_id = user_manager::known_user::GetDeviceId( | 157 const std::string device_id = user_manager::known_user::GetDeviceId( |
146 multi_user_util::GetAccountIdFromProfile(arc_auth_service->profile())); | 158 multi_user_util::GetAccountIdFromProfile(arc_auth_service->profile())); |
147 DCHECK(!device_id.empty()); | 159 DCHECK(!device_id.empty()); |
148 | 160 |
149 base::DictionaryValue request; | 161 base::DictionaryValue request; |
150 std::string request_string; | 162 std::string request_string; |
151 request.SetString(kAction, kActionInitialize); | 163 request.SetString(kAction, kActionInitialize); |
152 request.Set(kData, std::move(localized_strings)); | 164 request.Set(kData, std::move(localized_strings)); |
153 request.SetString(kDeviceId, device_id); | 165 request.SetString(kDeviceId, device_id); |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
208 | 220 |
209 base::DictionaryValue response; | 221 base::DictionaryValue response; |
210 response.SetString(kAction, kActionShowPage); | 222 response.SetString(kAction, kActionShowPage); |
211 response.SetInteger(kPage, static_cast<int>(page)); | 223 response.SetInteger(kPage, static_cast<int>(page)); |
212 response.SetString(kStatus, status); | 224 response.SetString(kStatus, status); |
213 std::string response_string; | 225 std::string response_string; |
214 base::JSONWriter::Write(response, &response_string); | 226 base::JSONWriter::Write(response, &response_string); |
215 client_->PostMessageFromNativeHost(response_string); | 227 client_->PostMessageFromNativeHost(response_string); |
216 } | 228 } |
217 | 229 |
218 void ArcSupportHost::EnableMetrics() { | 230 void ArcSupportHost::EnableMetrics(bool is_enabled) { |
219 InitiateMetricsReportingChange(true, OnMetricsReportingCallbackType()); | 231 InitiateMetricsReportingChange(is_enabled, OnMetricsReportingCallbackType()); |
232 } | |
233 | |
234 void ArcSupportHost::EnableBackupRestore(bool is_enabled) { | |
235 PrefService* pref_service = arc::ArcAuthService::Get()->profile()->GetPrefs(); | |
236 pref_service->SetBoolean(prefs::kArcBackupRestoreEnabled, is_enabled); | |
220 } | 237 } |
221 | 238 |
222 void ArcSupportHost::OnMessage(const std::string& request_string) { | 239 void ArcSupportHost::OnMessage(const std::string& request_string) { |
223 std::unique_ptr<base::Value> request_value = | 240 std::unique_ptr<base::Value> request_value = |
224 base::JSONReader::Read(request_string); | 241 base::JSONReader::Read(request_string); |
225 base::DictionaryValue* request; | 242 base::DictionaryValue* request; |
226 if (!request_value || !request_value->GetAsDictionary(&request)) { | 243 if (!request_value || !request_value->GetAsDictionary(&request)) { |
227 NOTREACHED(); | 244 NOTREACHED(); |
228 return; | 245 return; |
229 } | 246 } |
(...skipping 12 matching lines...) Expand all Loading... | |
242 } else if (action == kActionSetAuthCode) { | 259 } else if (action == kActionSetAuthCode) { |
243 std::string code; | 260 std::string code; |
244 if (!request->GetString(kCode, &code)) { | 261 if (!request->GetString(kCode, &code)) { |
245 NOTREACHED(); | 262 NOTREACHED(); |
246 return; | 263 return; |
247 } | 264 } |
248 arc_auth_service->SetAuthCodeAndStartArc(code); | 265 arc_auth_service->SetAuthCodeAndStartArc(code); |
249 } else if (action == kActionCancelAuthCode) { | 266 } else if (action == kActionCancelAuthCode) { |
250 arc_auth_service->CancelAuthCode(); | 267 arc_auth_service->CancelAuthCode(); |
251 } else if (action == kActionEnableMetrics) { | 268 } else if (action == kActionEnableMetrics) { |
252 EnableMetrics(); | 269 bool is_enabled; |
270 if (!request->GetBoolean(kEnabled, &is_enabled)) { | |
271 NOTREACHED(); | |
272 return; | |
273 } | |
274 EnableMetrics(is_enabled); | |
253 } else if (action == kActionSendFeedback) { | 275 } else if (action == kActionSendFeedback) { |
254 chrome::OpenFeedbackDialog(nullptr); | 276 chrome::OpenFeedbackDialog(nullptr); |
277 } else if (action == kActionSetBackupRestore) { | |
278 bool is_enabled; | |
279 if (!request->GetBoolean(kEnabled, &is_enabled)) { | |
280 NOTREACHED(); | |
281 return; | |
282 } | |
283 EnableBackupRestore(is_enabled); | |
255 } else { | 284 } else { |
256 NOTREACHED(); | 285 NOTREACHED(); |
257 } | 286 } |
258 } | 287 } |
259 | 288 |
260 scoped_refptr<base::SingleThreadTaskRunner> ArcSupportHost::task_runner() | 289 scoped_refptr<base::SingleThreadTaskRunner> ArcSupportHost::task_runner() |
261 const { | 290 const { |
262 return base::ThreadTaskRunnerHandle::Get(); | 291 return base::ThreadTaskRunnerHandle::Get(); |
263 } | 292 } |
OLD | NEW |