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

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

Issue 2429793003: arc: Use overlay to show links from ToS. (Closed)
Patch Set: learn-more-content rename Created 4 years, 2 months 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
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/arc_support/background.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 loadtime_data->SetString( 226 loadtime_data->SetString(
227 "learnMoreStatistics", 227 "learnMoreStatistics",
228 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_STATISTICS)); 228 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_STATISTICS));
229 loadtime_data->SetString( 229 loadtime_data->SetString(
230 "learnMoreBackupAndRestore", 230 "learnMoreBackupAndRestore",
231 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_BACKUP_AND_RESTORE)); 231 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_BACKUP_AND_RESTORE));
232 loadtime_data->SetString( 232 loadtime_data->SetString(
233 "learnMoreLocationServices", 233 "learnMoreLocationServices",
234 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_LOCATION_SERVICES)); 234 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_LOCATION_SERVICES));
235 loadtime_data->SetString( 235 loadtime_data->SetString(
236 "learnMoreClose", 236 "overlayClose",
237 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_CLOSE)); 237 l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_LEARN_MORE_CLOSE));
238 238
239 const std::string& app_locale = g_browser_process->GetApplicationLocale(); 239 const std::string& app_locale = g_browser_process->GetApplicationLocale();
240 const std::string& country_code = base::CountryCodeForCurrentTimezone(); 240 const std::string& country_code = base::CountryCodeForCurrentTimezone();
241 loadtime_data->SetString("countryCode", country_code); 241 loadtime_data->SetString("countryCode", country_code);
242 loadtime_data->SetBoolean(kArcManaged, arc_auth_service->IsArcManaged()); 242 loadtime_data->SetBoolean(kArcManaged, arc_auth_service->IsArcManaged());
243 243
244 webui::SetLoadTimeDataDefaults(app_locale, loadtime_data.get()); 244 webui::SetLoadTimeDataDefaults(app_locale, loadtime_data.get());
245 DCHECK(arc_auth_service); 245 DCHECK(arc_auth_service);
246 const std::string device_id = user_manager::known_user::GetDeviceId( 246 const std::string device_id = user_manager::known_user::GetDeviceId(
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 } else { 409 } else {
410 LOG(ERROR) << "Unknown message: " << message_string; 410 LOG(ERROR) << "Unknown message: " << message_string;
411 NOTREACHED(); 411 NOTREACHED();
412 } 412 }
413 } 413 }
414 414
415 scoped_refptr<base::SingleThreadTaskRunner> ArcSupportHost::task_runner() 415 scoped_refptr<base::SingleThreadTaskRunner> ArcSupportHost::task_runner()
416 const { 416 const {
417 return base::ThreadTaskRunnerHandle::Get(); 417 return base::ThreadTaskRunnerHandle::Get();
418 } 418 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/arc_support/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698