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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_dropdown.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index a4811d1c7a11ee1158551138481d7bde7f60b5e2..9b6bd696b6cc497eb19b229dae398f9656a69cd6 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -118,13 +118,9 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {
// NetworkDropdown -------------------------------------------------------------
-NetworkDropdown::NetworkDropdown(Actor* actor,
- content::WebUI* web_ui,
- bool oobe)
- : actor_(actor),
- web_ui_(web_ui),
- oobe_(oobe) {
- DCHECK(actor_);
+NetworkDropdown::NetworkDropdown(View* view, content::WebUI* web_ui, bool oobe)
+ : view_(view), web_ui_(web_ui), oobe_(oobe) {
+ DCHECK(view_);
network_menu_.reset(new NetworkMenuWebUI(this, web_ui));
DCHECK(NetworkHandler::IsInitialized());
NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
@@ -162,7 +158,7 @@ bool NetworkDropdown::ShouldOpenButtonOptions() const {
}
void NetworkDropdown::OnConnectToNetworkRequested() {
- actor_->OnConnectToNetworkRequested();
+ view_->OnConnectToNetworkRequested();
}
void NetworkDropdown::DefaultNetworkChanged(const NetworkState* network) {

Powered by Google App Engine
This is Rietveld 408576698