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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

Issue 878253002: LocalizedValuesBuilder moved to components/login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed dependency on 'base'. Created 5 years, 10 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
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/ui/webui/chromeos/login/enrollment_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h" 15 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
16 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 16 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
17 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h" 17 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
18 #include "chrome/browser/chromeos/profiles/profile_helper.h" 18 #include "chrome/browser/chromeos/profiles/profile_helper.h"
19 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" 19 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 21 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
22 #include "chrome/grit/generated_resources.h" 22 #include "chrome/grit/generated_resources.h"
23 #include "chromeos/network/network_state.h" 23 #include "chromeos/network/network_state.h"
24 #include "chromeos/network/network_state_handler.h" 24 #include "chromeos/network/network_state_handler.h"
25 #include "components/login/localized_values_builder.h"
25 #include "components/policy/core/browser/cloud/message_util.h" 26 #include "components/policy/core/browser/cloud/message_util.h"
26 #include "google_apis/gaia/gaia_auth_util.h" 27 #include "google_apis/gaia/gaia_auth_util.h"
27 #include "google_apis/gaia/gaia_urls.h" 28 #include "google_apis/gaia/gaia_urls.h"
28 #include "google_apis/gaia/google_service_auth_error.h" 29 #include "google_apis/gaia/google_service_auth_error.h"
29 #include "net/url_request/url_request_context_getter.h" 30 #include "net/url_request/url_request_context_getter.h"
30 #include "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
31 32
32 namespace chromeos { 33 namespace chromeos {
33 namespace { 34 namespace {
34 35
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 // EnrollmentScreenHandler BaseScreenHandler implementation ----- 333 // EnrollmentScreenHandler BaseScreenHandler implementation -----
333 334
334 void EnrollmentScreenHandler::Initialize() { 335 void EnrollmentScreenHandler::Initialize() {
335 if (show_on_init_) { 336 if (show_on_init_) {
336 Show(); 337 Show();
337 show_on_init_ = false; 338 show_on_init_ = false;
338 } 339 }
339 } 340 }
340 341
341 void EnrollmentScreenHandler::DeclareLocalizedValues( 342 void EnrollmentScreenHandler::DeclareLocalizedValues(
342 LocalizedValuesBuilder* builder) { 343 ::login::LocalizedValuesBuilder* builder) {
343 builder->Add("oauthEnrollScreenTitle", 344 builder->Add("oauthEnrollScreenTitle",
344 IDS_ENTERPRISE_ENROLLMENT_SCREEN_TITLE); 345 IDS_ENTERPRISE_ENROLLMENT_SCREEN_TITLE);
345 builder->Add("oauthEnrollDescription", IDS_ENTERPRISE_ENROLLMENT_DESCRIPTION); 346 builder->Add("oauthEnrollDescription", IDS_ENTERPRISE_ENROLLMENT_DESCRIPTION);
346 builder->Add("oauthEnrollReEnrollmentText", 347 builder->Add("oauthEnrollReEnrollmentText",
347 IDS_ENTERPRISE_ENROLLMENT_RE_ENROLLMENT_TEXT); 348 IDS_ENTERPRISE_ENROLLMENT_RE_ENROLLMENT_TEXT);
348 builder->Add("oauthEnrollRetry", IDS_ENTERPRISE_ENROLLMENT_RETRY); 349 builder->Add("oauthEnrollRetry", IDS_ENTERPRISE_ENROLLMENT_RETRY);
349 builder->Add("oauthEnrollCancel", IDS_ENTERPRISE_ENROLLMENT_CANCEL); 350 builder->Add("oauthEnrollCancel", IDS_ENTERPRISE_ENROLLMENT_CANCEL);
350 builder->Add("oauthEnrollBack", IDS_ENTERPRISE_ENROLLMENT_BACK); 351 builder->Add("oauthEnrollBack", IDS_ENTERPRISE_ENROLLMENT_BACK);
351 builder->Add("oauthEnrollDone", IDS_ENTERPRISE_ENROLLMENT_DONE); 352 builder->Add("oauthEnrollDone", IDS_ENTERPRISE_ENROLLMENT_DONE);
352 builder->Add("oauthEnrollSuccess", IDS_ENTERPRISE_ENROLLMENT_SUCCESS); 353 builder->Add("oauthEnrollSuccess", IDS_ENTERPRISE_ENROLLMENT_SUCCESS);
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 548
548 ShowScreen(OobeUI::kScreenOobeEnrollment, &screen_data); 549 ShowScreen(OobeUI::kScreenOobeEnrollment, &screen_data);
549 if (first_show_) { 550 if (first_show_) {
550 first_show_ = false; 551 first_show_ = false;
551 UpdateStateInternal(ErrorScreenActor::ERROR_REASON_UPDATE, true); 552 UpdateStateInternal(ErrorScreenActor::ERROR_REASON_UPDATE, true);
552 } 553 }
553 histogram_helper_->OnScreenShow(); 554 histogram_helper_->OnScreenShow();
554 } 555 }
555 556
556 } // namespace chromeos 557 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698