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

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

Issue 2713513009: cros: Break BaseScreenHandler into two classes. (Closed)
Patch Set: Add comments, fix compile Created 3 years, 9 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
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(CoreOobeView* core_oobe_view) 57 NetworkScreenHandler::NetworkScreenHandler(CoreOobeView* core_oobe_view)
58 : core_oobe_view_(core_oobe_view) { 58 : BaseScreenHandler(kScreenId), core_oobe_view_(core_oobe_view) {
59 set_call_js_prefix(kJsScreenPath); 59 set_call_js_prefix(kJsScreenPath);
60 DCHECK(core_oobe_view_); 60 DCHECK(core_oobe_view_);
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
68 // NetworkScreenHandler, NetworkScreenView implementation: --------------------- 68 // NetworkScreenHandler, NetworkScreenView implementation: ---------------------
(...skipping 21 matching lines...) Expand all
90 // should be able to select any of the available networks on the device. 90 // should be able to select any of the available networks on the device.
91 NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler(); 91 NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
92 handler->SetTechnologyEnabled(NetworkTypePattern::NonVirtual(), 92 handler->SetTechnologyEnabled(NetworkTypePattern::NonVirtual(),
93 true, 93 true,
94 chromeos::network_handler::ErrorCallback()); 94 chromeos::network_handler::ErrorCallback());
95 95
96 base::DictionaryValue network_screen_params; 96 base::DictionaryValue network_screen_params;
97 network_screen_params.SetBoolean("isDeveloperMode", 97 network_screen_params.SetBoolean("isDeveloperMode",
98 base::CommandLine::ForCurrentProcess()->HasSwitch( 98 base::CommandLine::ForCurrentProcess()->HasSwitch(
99 chromeos::switches::kSystemDevMode)); 99 chromeos::switches::kSystemDevMode));
100 ShowScreenWithData(OobeScreen::SCREEN_OOBE_NETWORK, &network_screen_params); 100 ShowScreenWithData(kScreenId, &network_screen_params);
101 core_oobe_view_->InitDemoModeDetection(); 101 core_oobe_view_->InitDemoModeDetection();
102 } 102 }
103 103
104 void NetworkScreenHandler::Hide() { 104 void NetworkScreenHandler::Hide() {
105 } 105 }
106 106
107 void NetworkScreenHandler::Bind(NetworkScreen* screen) { 107 void NetworkScreenHandler::Bind(NetworkScreen* screen) {
108 screen_ = screen; 108 screen_ = screen;
109 BaseScreenHandler::SetBaseScreen(screen_); 109 BaseScreenHandler::SetBaseScreen(screen_);
110 } 110 }
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 timezone_option->SetString("value", timezone_id); 289 timezone_option->SetString("value", timezone_id);
290 timezone_option->SetString("title", timezone_name); 290 timezone_option->SetString("title", timezone_name);
291 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); 291 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
292 timezone_list->Append(std::move(timezone_option)); 292 timezone_list->Append(std::move(timezone_option));
293 } 293 }
294 294
295 return timezone_list.release(); 295 return timezone_list.release();
296 } 296 }
297 297
298 } // namespace chromeos 298 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698