Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(521)

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

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
OLDNEW
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/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/chromeos/idle_detector.h" 21 #include "chrome/browser/chromeos/idle_detector.h"
22 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" 22 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
23 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" 23 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
24 #include "chrome/browser/chromeos/system/input_device_settings.h" 24 #include "chrome/browser/chromeos/system/input_device_settings.h"
25 #include "chrome/browser/chromeos/system/timezone_util.h" 25 #include "chrome/browser/chromeos/system/timezone_util.h"
26 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" 26 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
27 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 27 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
28 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
29 #include "chrome/grit/generated_resources.h" 29 #include "chrome/grit/generated_resources.h"
30 #include "chromeos/chromeos_switches.h" 30 #include "chromeos/chromeos_switches.h"
31 #include "chromeos/ime/extension_ime_util.h"
31 #include "chromeos/network/network_handler.h" 32 #include "chromeos/network/network_handler.h"
32 #include "chromeos/network/network_state_handler.h" 33 #include "chromeos/network/network_state_handler.h"
33 #include "components/user_manager/user_manager.h" 34 #include "components/user_manager/user_manager.h"
34 #include "content/public/browser/browser_thread.h" 35 #include "content/public/browser/browser_thread.h"
35 #include "ui/base/ime/chromeos/extension_ime_util.h"
36 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
37 #include "ui/gfx/rect.h" 37 #include "ui/gfx/rect.h"
38 #include "ui/views/layout/fill_layout.h" 38 #include "ui/views/layout/fill_layout.h"
39 #include "ui/views/widget/widget.h" 39 #include "ui/views/widget/widget.h"
40 40
41 namespace { 41 namespace {
42 42
43 const char kJsScreenPath[] = "login.NetworkScreen"; 43 const char kJsScreenPath[] = "login.NetworkScreen";
44 44
45 // JS API callbacks names. 45 // JS API callbacks names.
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 timezone_option->SetString("value", timezone_id); 396 timezone_option->SetString("value", timezone_id);
397 timezone_option->SetString("title", timezone_name); 397 timezone_option->SetString("title", timezone_name);
398 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); 398 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
399 timezone_list->Append(timezone_option.release()); 399 timezone_list->Append(timezone_option.release());
400 } 400 }
401 401
402 return timezone_list.release(); 402 return timezone_list.release();
403 } 403 }
404 404
405 } // namespace chromeos 405 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698