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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" | 26 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
27 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
28 #include "chrome/grit/generated_resources.h" | 28 #include "chrome/grit/generated_resources.h" |
29 #include "chromeos/chromeos_switches.h" | 29 #include "chromeos/chromeos_switches.h" |
30 #include "chromeos/network/network_handler.h" | 30 #include "chromeos/network/network_handler.h" |
31 #include "chromeos/network/network_state_handler.h" | 31 #include "chromeos/network/network_state_handler.h" |
32 #include "components/user_manager/user_manager.h" | 32 #include "components/user_manager/user_manager.h" |
33 #include "content/public/browser/browser_thread.h" | 33 #include "content/public/browser/browser_thread.h" |
34 #include "ui/base/ime/chromeos/extension_ime_util.h" | 34 #include "ui/base/ime/chromeos/extension_ime_util.h" |
35 #include "ui/base/l10n/l10n_util.h" | 35 #include "ui/base/l10n/l10n_util.h" |
36 #include "ui/gfx/rect.h" | 36 #include "ui/gfx/geometry/rect.h" |
37 #include "ui/views/layout/fill_layout.h" | 37 #include "ui/views/layout/fill_layout.h" |
38 #include "ui/views/widget/widget.h" | 38 #include "ui/views/widget/widget.h" |
39 | 39 |
40 namespace { | 40 namespace { |
41 const char kJsScreenPath[] = "login.NetworkScreen"; | 41 const char kJsScreenPath[] = "login.NetworkScreen"; |
42 } // namespace | 42 } // namespace |
43 | 43 |
44 namespace chromeos { | 44 namespace chromeos { |
45 | 45 |
46 // NetworkScreenHandler, public: ----------------------------------------------- | 46 // NetworkScreenHandler, public: ----------------------------------------------- |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 timezone_option->SetString("value", timezone_id); | 245 timezone_option->SetString("value", timezone_id); |
246 timezone_option->SetString("title", timezone_name); | 246 timezone_option->SetString("title", timezone_name); |
247 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); | 247 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); |
248 timezone_list->Append(timezone_option.release()); | 248 timezone_list->Append(timezone_option.release()); |
249 } | 249 } |
250 | 250 |
251 return timezone_list.release(); | 251 return timezone_list.release(); |
252 } | 252 } |
253 | 253 |
254 } // namespace chromeos | 254 } // namespace chromeos |
OLD | NEW |