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 <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" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 29 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
30 #include "chrome/browser/chromeos/system/input_device_settings.h" | 30 #include "chrome/browser/chromeos/system/input_device_settings.h" |
31 #include "chrome/browser/chromeos/system/timezone_util.h" | 31 #include "chrome/browser/chromeos/system/timezone_util.h" |
32 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" | 32 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
33 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler
.h" | 33 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler
.h" |
34 #include "chrome/common/pref_names.h" | 34 #include "chrome/common/pref_names.h" |
35 #include "chromeos/chromeos_switches.h" | 35 #include "chromeos/chromeos_switches.h" |
36 #include "chromeos/ime/extension_ime_util.h" | 36 #include "chromeos/ime/extension_ime_util.h" |
37 #include "chromeos/network/network_handler.h" | 37 #include "chromeos/network/network_handler.h" |
38 #include "chromeos/network/network_state_handler.h" | 38 #include "chromeos/network/network_state_handler.h" |
39 #include "chromeos/network/shill_property_util.h" | |
40 #include "grit/chromium_strings.h" | 39 #include "grit/chromium_strings.h" |
41 #include "grit/generated_resources.h" | 40 #include "grit/generated_resources.h" |
42 #include "ui/base/l10n/l10n_util.h" | 41 #include "ui/base/l10n/l10n_util.h" |
43 #include "ui/gfx/rect.h" | 42 #include "ui/gfx/rect.h" |
44 #include "ui/views/layout/fill_layout.h" | 43 #include "ui/views/layout/fill_layout.h" |
45 #include "ui/views/widget/widget.h" | 44 #include "ui/views/widget/widget.h" |
46 | 45 |
47 namespace { | 46 namespace { |
48 | 47 |
49 const char kJsScreenPath[] = "login.NetworkScreen"; | 48 const char kJsScreenPath[] = "login.NetworkScreen"; |
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
629 timezone_option->SetString("value", timezone_id); | 628 timezone_option->SetString("value", timezone_id); |
630 timezone_option->SetString("title", timezone_name); | 629 timezone_option->SetString("title", timezone_name); |
631 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); | 630 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); |
632 timezone_list->Append(timezone_option.release()); | 631 timezone_list->Append(timezone_option.release()); |
633 } | 632 } |
634 | 633 |
635 return timezone_list.release(); | 634 return timezone_list.release(); |
636 } | 635 } |
637 | 636 |
638 } // namespace chromeos | 637 } // namespace chromeos |
OLD | NEW |