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

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

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Rebase Created 3 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/task_runner_util.h" 16 #include "base/task_runner_util.h"
17 #include "base/threading/worker_pool.h" 17 #include "base/threading/worker_pool.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 20 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
21 #include "chrome/browser/chromeos/customization/customization_document.h" 21 #include "chrome/browser/chromeos/customization/customization_document.h"
22 #include "chrome/browser/chromeos/idle_detector.h" 22 #include "chrome/browser/chromeos/idle_detector.h"
23 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" 23 #include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
24 #include "chrome/browser/chromeos/login/screens/network_screen.h" 24 #include "chrome/browser/chromeos/login/screens/network_screen.h"
25 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" 25 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
26 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 26 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
27 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 27 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
28 #include "chrome/browser/chromeos/system/input_device_settings.h" 28 #include "chrome/browser/chromeos/system/input_device_settings.h"
29 #include "chrome/browser/chromeos/system/timezone_util.h" 29 #include "chrome/browser/chromeos/system/timezone_util.h"
30 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" 30 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
31 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 31 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
32 #include "chrome/common/pref_names.h" 32 #include "chrome/common/pref_names.h"
33 #include "chrome/grit/generated_resources.h" 33 #include "chrome/grit/generated_resources.h"
(...skipping 13 matching lines...) Expand all
47 namespace { 47 namespace {
48 48
49 const char kJsScreenPath[] = "login.NetworkScreen"; 49 const char kJsScreenPath[] = "login.NetworkScreen";
50 50
51 } // namespace 51 } // namespace
52 52
53 namespace chromeos { 53 namespace chromeos {
54 54
55 // NetworkScreenHandler, public: ----------------------------------------------- 55 // NetworkScreenHandler, public: -----------------------------------------------
56 56
57 NetworkScreenHandler::NetworkScreenHandler(CoreOobeActor* core_oobe_actor) 57 NetworkScreenHandler::NetworkScreenHandler(CoreOobeView* core_oobe_actor)
58 : core_oobe_actor_(core_oobe_actor) { 58 : core_oobe_actor_(core_oobe_actor) {
59 set_call_js_prefix(kJsScreenPath); 59 set_call_js_prefix(kJsScreenPath);
60 DCHECK(core_oobe_actor_); 60 DCHECK(core_oobe_actor_);
61 } 61 }
62 62
63 NetworkScreenHandler::~NetworkScreenHandler() { 63 NetworkScreenHandler::~NetworkScreenHandler() {
64 if (screen_) 64 if (screen_)
65 screen_->OnViewDestroyed(this); 65 screen_->OnViewDestroyed(this);
66 } 66 }
67 67
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 timezone_option->SetString("value", timezone_id); 288 timezone_option->SetString("value", timezone_id);
289 timezone_option->SetString("title", timezone_name); 289 timezone_option->SetString("title", timezone_name);
290 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); 290 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
291 timezone_list->Append(std::move(timezone_option)); 291 timezone_list->Append(std::move(timezone_option));
292 } 292 }
293 293
294 return timezone_list.release(); 294 return timezone_list.release();
295 } 295 }
296 296
297 } // namespace chromeos 297 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698