chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/reset_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/network_screen_handler.h"	5 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

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/command_line.h"	11 #include "base/command_line.h"

12 #include "base/prefs/pref_service.h"

13 #include "base/strings/string16.h"	12 #include "base/strings/string16.h"

14 #include "base/strings/utf_string_conversions.h"	13 #include "base/strings/utf_string_conversions.h"

15 #include "base/task_runner_util.h"	14 #include "base/task_runner_util.h"

16 #include "base/threading/worker_pool.h"	15 #include "base/threading/worker_pool.h"

17 #include "base/values.h"	16 #include "base/values.h"

18 #include "chrome/browser/browser_process.h"	17 #include "chrome/browser/browser_process.h"

19 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	18 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

20 #include "chrome/browser/chromeos/customization/customization_document.h"	19 #include "chrome/browser/chromeos/customization/customization_document.h"

21 #include "chrome/browser/chromeos/idle_detector.h"	20 #include "chrome/browser/chromeos/idle_detector.h"

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

23 #include "chrome/browser/chromeos/login/screens/network_model.h"	22 #include "chrome/browser/chromeos/login/screens/network_model.h"

24 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"	23 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"

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

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

27 #include "chrome/browser/chromeos/system/input_device_settings.h"	26 #include "chrome/browser/chromeos/system/input_device_settings.h"

28 #include "chrome/browser/chromeos/system/timezone_util.h"	27 #include "chrome/browser/chromeos/system/timezone_util.h"

29 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"	28 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"

30 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"	29 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

31 #include "chrome/common/pref_names.h"	30 #include "chrome/common/pref_names.h"

32 #include "chrome/grit/generated_resources.h"	31 #include "chrome/grit/generated_resources.h"

33 #include "chromeos/chromeos_switches.h"	32 #include "chromeos/chromeos_switches.h"

34 #include "chromeos/network/network_handler.h"	33 #include "chromeos/network/network_handler.h"

35 #include "chromeos/network/network_state_handler.h"	34 #include "chromeos/network/network_state_handler.h"

36 #include "components/login/localized_values_builder.h"	35 #include "components/login/localized_values_builder.h"

	36 #include "components/prefs/pref_service.h"

37 #include "components/strings/grit/components_strings.h"	37 #include "components/strings/grit/components_strings.h"

38 #include "components/user_manager/user_manager.h"	38 #include "components/user_manager/user_manager.h"

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

40 #include "ui/base/ime/chromeos/extension_ime_util.h"	40 #include "ui/base/ime/chromeos/extension_ime_util.h"

41 #include "ui/base/l10n/l10n_util.h"	41 #include "ui/base/l10n/l10n_util.h"

42 #include "ui/gfx/geometry/rect.h"	42 #include "ui/gfx/geometry/rect.h"

43 #include "ui/views/layout/fill_layout.h"	43 #include "ui/views/layout/fill_layout.h"

44 #include "ui/views/widget/widget.h"	44 #include "ui/views/widget/widget.h"

45	45

46 namespace {	46 namespace {

(...skipping 219 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
266 timezone_option->SetString("value", timezone_id);	266 timezone_option->SetString("value", timezone_id);

267 timezone_option->SetString("title", timezone_name);	267 timezone_option->SetString("title", timezone_name);

268 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);	268 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);

269 timezone_list->Append(timezone_option.release());	269 timezone_list->Append(timezone_option.release());

270 }	270 }

271	271

272 return timezone_list.release();	272 return timezone_list.release();

273 }	273 }

274	274

275 } // namespace chromeos	275 } // namespace chromeos

OLD	NEW