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 <utility> |
| 10 |
9 #include "base/bind.h" | 11 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 12 #include "base/bind_helpers.h" |
11 #include "base/command_line.h" | 13 #include "base/command_line.h" |
12 #include "base/strings/string16.h" | 14 #include "base/strings/string16.h" |
13 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
14 #include "base/task_runner_util.h" | 16 #include "base/task_runner_util.h" |
15 #include "base/threading/worker_pool.h" | 17 #include "base/threading/worker_pool.h" |
16 #include "base/values.h" | 18 #include "base/values.h" |
17 #include "chrome/browser/browser_process.h" | 19 #include "chrome/browser/browser_process.h" |
18 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 20 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 CHECK(timezone->GetString(0, &timezone_id)); | 280 CHECK(timezone->GetString(0, &timezone_id)); |
279 | 281 |
280 std::string timezone_name; | 282 std::string timezone_name; |
281 CHECK(timezone->GetString(1, &timezone_name)); | 283 CHECK(timezone->GetString(1, &timezone_name)); |
282 | 284 |
283 std::unique_ptr<base::DictionaryValue> timezone_option( | 285 std::unique_ptr<base::DictionaryValue> timezone_option( |
284 new base::DictionaryValue); | 286 new base::DictionaryValue); |
285 timezone_option->SetString("value", timezone_id); | 287 timezone_option->SetString("value", timezone_id); |
286 timezone_option->SetString("title", timezone_name); | 288 timezone_option->SetString("title", timezone_name); |
287 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); | 289 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); |
288 timezone_list->Append(timezone_option.release()); | 290 timezone_list->Append(std::move(timezone_option)); |
289 } | 291 } |
290 | 292 |
291 return timezone_list.release(); | 293 return timezone_list.release(); |
292 } | 294 } |
293 | 295 |
294 } // namespace chromeos | 296 } // namespace chromeos |
OLD | NEW |