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

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

Issue 2460933003: [Merge-M55] arc: Add Goolge Privacy Policy link to OptIn UI. (Closed)
Patch Set: 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 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"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_STATISTICS)); 217 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_STATISTICS));
218 loadtime_data->SetString( 218 loadtime_data->SetString(
219 "learnMoreBackupAndRestore", 219 "learnMoreBackupAndRestore",
220 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_BACKUP_AND_RESTORE)); 220 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_BACKUP_AND_RESTORE));
221 loadtime_data->SetString( 221 loadtime_data->SetString(
222 "learnMoreLocationServices", 222 "learnMoreLocationServices",
223 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_LOCATION_SERVICES)); 223 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_LOCATION_SERVICES));
224 loadtime_data->SetString( 224 loadtime_data->SetString(
225 "overlayClose", 225 "overlayClose",
226 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_CLOSE)); 226 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_CLOSE));
227 loadtime_data->SetString(
228 "privacyPolicyLink",
229 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_PRIVACY_POLICY_LINK));
227 230
228 const std::string& app_locale = g_browser_process->GetApplicationLocale(); 231 const std::string& app_locale = g_browser_process->GetApplicationLocale();
229 const std::string& country_code = base::CountryCodeForCurrentTimezone(); 232 const std::string& country_code = base::CountryCodeForCurrentTimezone();
230 loadtime_data->SetString("countryCode", country_code); 233 loadtime_data->SetString("countryCode", country_code);
231 loadtime_data->SetBoolean(kArcManaged, arc_auth_service->IsArcManaged()); 234 loadtime_data->SetBoolean(kArcManaged, arc_auth_service->IsArcManaged());
232 235
233 webui::SetLoadTimeDataDefaults(app_locale, loadtime_data.get()); 236 webui::SetLoadTimeDataDefaults(app_locale, loadtime_data.get());
234 DCHECK(arc_auth_service); 237 DCHECK(arc_auth_service);
235 const std::string device_id = user_manager::known_user::GetDeviceId( 238 const std::string device_id = user_manager::known_user::GetDeviceId(
236 multi_user_util::GetAccountIdFromProfile(arc_auth_service->profile())); 239 multi_user_util::GetAccountIdFromProfile(arc_auth_service->profile()));
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 } else { 418 } else {
416 LOG(ERROR) << "Unknown message: " << message_string; 419 LOG(ERROR) << "Unknown message: " << message_string;
417 NOTREACHED(); 420 NOTREACHED();
418 } 421 }
419 } 422 }
420 423
421 scoped_refptr<base::SingleThreadTaskRunner> ArcSupportHost::task_runner() 424 scoped_refptr<base::SingleThreadTaskRunner> ArcSupportHost::task_runner()
422 const { 425 const {
423 return base::ThreadTaskRunnerHandle::Get(); 426 return base::ThreadTaskRunnerHandle::Get();
424 } 427 }
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/resources/chromeos/arc_support/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698