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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc

Issue 8681029: [cros] Make disconnected icons used by network drop-down and network button consistent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 9 years, 1 month 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_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
index 5c4661030cfd6cbdf9fcd8e0fe78203965965506..9b544d8036e43ca580c7384b0b9f345b014792cd 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
@@ -6,6 +6,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/values.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/login/webui_login_display.h"
#include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
#include "content/browser/webui/web_ui.h"
@@ -66,7 +68,7 @@ void NetworkDropdownHandler::HandleNetworkItemChosen(
void NetworkDropdownHandler::HandleNetworkDropdownShow(
const base::ListValue* args) {
- DCHECK(args->GetSize() == 2);
+ DCHECK(args->GetSize() == 3);
std::string element_id;
if (!args->GetString(0, &element_id))
NOTREACHED();
@@ -74,7 +76,17 @@ void NetworkDropdownHandler::HandleNetworkDropdownShow(
if (!args->GetBoolean(1, &oobe))
NOTREACHED();
+
+ double last_network_type = -1; // Javascript passes integer as double.
+ if (!args->GetDouble(2, &last_network_type))
+ NOTREACHED();
+
dropdown_.reset(new NetworkDropdown(web_ui_, GetNativeWindow(), oobe));
+
+ if (last_network_type >= 0) {
+ dropdown_->SetLastNetworkType(
+ static_cast<ConnectionType>(last_network_type));
+ }
}
void NetworkDropdownHandler::HandleNetworkDropdownHide(

Powered by Google App Engine
This is Rietveld 408576698