chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc - Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values.

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

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)

Patch Set: Address comments Created 3 years, 11 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:

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/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 "ash/common/system/chromeos/devicetype_utils.h"	9 #include "ash/common/system/chromeos/devicetype_utils.h"

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "base/bind_helpers.h"	11 #include "base/bind_helpers.h"

12 #include "base/files/file_util.h"	12 #include "base/files/file_util.h"

13 #include "base/logging.h"	13 #include "base/logging.h"

14 #include "base/macros.h"	14 #include "base/macros.h"

15 #include "base/values.h"	15 #include "base/values.h"

16 #include "chrome/browser/browser_process.h"	16 #include "chrome/browser/browser_process.h"

17 #include "chrome/browser/browser_process_platform_part.h"	17 #include "chrome/browser/browser_process_platform_part.h"

18 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"	18 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"

19 #include "chrome/browser/chromeos/login/help_app_launcher.h"	19 #include "chrome/browser/chromeos/login/help_app_launcher.h"

20 #include "chrome/browser/chromeos/login/helper.h"	20 #include "chrome/browser/chromeos/login/helper.h"

	21 #include "chrome/browser/chromeos/login/oobe_screen.h"

21 #include "chrome/browser/chromeos/login/screens/network_error.h"	22 #include "chrome/browser/chromeos/login/screens/network_error.h"

22 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"	23 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

23 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"	24 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"

24 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"	25 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"

25 #include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h"	26 #include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h"

26 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"

27 #include "chrome/grit/generated_resources.h"	27 #include "chrome/grit/generated_resources.h"

28 #include "chromeos/dbus/auth_policy_client.h"	28 #include "chromeos/dbus/auth_policy_client.h"

29 #include "chromeos/dbus/dbus_thread_manager.h"	29 #include "chromeos/dbus/dbus_thread_manager.h"

30 #include "chromeos/network/network_state.h"	30 #include "chromeos/network/network_state.h"

31 #include "chromeos/network/network_state_handler.h"	31 #include "chromeos/network/network_state_handler.h"

32 #include "components/login/localized_values_builder.h"	32 #include "components/login/localized_values_builder.h"

33 #include "components/policy/core/browser/cloud/message_util.h"	33 #include "components/policy/core/browser/cloud/message_util.h"

34 #include "content/public/browser/browser_thread.h"	34 #include "content/public/browser/browser_thread.h"

35 #include "google_apis/gaia/gaia_auth_util.h"	35 #include "google_apis/gaia/gaia_auth_util.h"

36 #include "google_apis/gaia/gaia_urls.h"	36 #include "google_apis/gaia/gaia_urls.h"

(...skipping 621 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
658	658

659 ShowScreenWithData(OobeScreen::SCREEN_OOBE_ENROLLMENT, &screen_data);	659 ShowScreenWithData(OobeScreen::SCREEN_OOBE_ENROLLMENT, &screen_data);

660 if (first_show_) {	660 if (first_show_) {

661 first_show_ = false;	661 first_show_ = false;

662 UpdateStateInternal(NetworkError::ERROR_REASON_UPDATE, true);	662 UpdateStateInternal(NetworkError::ERROR_REASON_UPDATE, true);

663 }	663 }

664 histogram_helper_->OnScreenShow();	664 histogram_helper_->OnScreenShow();

665 }	665 }

666	666

667 } // namespace chromeos	667 } // namespace chromeos

OLD	NEW