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_dropdown.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 } | 111 } |
112 if (type == ui::MenuModel::TYPE_SUBMENU) | 112 if (type == ui::MenuModel::TYPE_SUBMENU) |
113 item->Set("sub", ConvertMenuModel(model->GetSubmenuModelAt(i))); | 113 item->Set("sub", ConvertMenuModel(model->GetSubmenuModelAt(i))); |
114 list->Append(std::move(item)); | 114 list->Append(std::move(item)); |
115 } | 115 } |
116 return list; | 116 return list; |
117 } | 117 } |
118 | 118 |
119 // NetworkDropdown ------------------------------------------------------------- | 119 // NetworkDropdown ------------------------------------------------------------- |
120 | 120 |
121 NetworkDropdown::NetworkDropdown(Actor* actor, | 121 NetworkDropdown::NetworkDropdown(View* view, content::WebUI* web_ui, bool oobe) |
122 content::WebUI* web_ui, | 122 : view_(view), web_ui_(web_ui), oobe_(oobe) { |
123 bool oobe) | 123 DCHECK(view_); |
124 : actor_(actor), | |
125 web_ui_(web_ui), | |
126 oobe_(oobe) { | |
127 DCHECK(actor_); | |
128 network_menu_.reset(new NetworkMenuWebUI(this, web_ui)); | 124 network_menu_.reset(new NetworkMenuWebUI(this, web_ui)); |
129 DCHECK(NetworkHandler::IsInitialized()); | 125 DCHECK(NetworkHandler::IsInitialized()); |
130 NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler(); | 126 NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler(); |
131 handler->RequestScan(); | 127 handler->RequestScan(); |
132 handler->AddObserver(this, FROM_HERE); | 128 handler->AddObserver(this, FROM_HERE); |
133 Refresh(); | 129 Refresh(); |
134 network_scan_timer_.Start( | 130 network_scan_timer_.Start( |
135 FROM_HERE, | 131 FROM_HERE, |
136 base::TimeDelta::FromSeconds(kNetworkScanIntervalSecs), | 132 base::TimeDelta::FromSeconds(kNetworkScanIntervalSecs), |
137 this, &NetworkDropdown::RequestNetworkScan); | 133 this, &NetworkDropdown::RequestNetworkScan); |
(...skipping 17 matching lines...) Expand all Loading... |
155 | 151 |
156 void NetworkDropdown::OpenButtonOptions() { | 152 void NetworkDropdown::OpenButtonOptions() { |
157 LoginDisplayHost::default_host()->OpenProxySettings(); | 153 LoginDisplayHost::default_host()->OpenProxySettings(); |
158 } | 154 } |
159 | 155 |
160 bool NetworkDropdown::ShouldOpenButtonOptions() const { | 156 bool NetworkDropdown::ShouldOpenButtonOptions() const { |
161 return !oobe_; | 157 return !oobe_; |
162 } | 158 } |
163 | 159 |
164 void NetworkDropdown::OnConnectToNetworkRequested() { | 160 void NetworkDropdown::OnConnectToNetworkRequested() { |
165 actor_->OnConnectToNetworkRequested(); | 161 view_->OnConnectToNetworkRequested(); |
166 } | 162 } |
167 | 163 |
168 void NetworkDropdown::DefaultNetworkChanged(const NetworkState* network) { | 164 void NetworkDropdown::DefaultNetworkChanged(const NetworkState* network) { |
169 Refresh(); | 165 Refresh(); |
170 } | 166 } |
171 | 167 |
172 void NetworkDropdown::NetworkConnectionStateChanged( | 168 void NetworkDropdown::NetworkConnectionStateChanged( |
173 const NetworkState* network) { | 169 const NetworkState* network) { |
174 Refresh(); | 170 Refresh(); |
175 } | 171 } |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 web_ui_->CallJavascriptFunctionUnsafe("cr.ui.DropDown.updateNetworkTitle", | 205 web_ui_->CallJavascriptFunctionUnsafe("cr.ui.DropDown.updateNetworkTitle", |
210 title, icon); | 206 title, icon); |
211 } | 207 } |
212 | 208 |
213 void NetworkDropdown::RequestNetworkScan() { | 209 void NetworkDropdown::RequestNetworkScan() { |
214 NetworkHandler::Get()->network_state_handler()->RequestScan(); | 210 NetworkHandler::Get()->network_state_handler()->RequestScan(); |
215 Refresh(); | 211 Refresh(); |
216 } | 212 } |
217 | 213 |
218 } // namespace chromeos | 214 } // namespace chromeos |
OLD | NEW |