[cros] Make disconnected icons used by network drop-down and network button consistent.

chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/values.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
+#include "chrome/browser/chromeos/cros/network_library.h"

[whywhat, 2011/11/29 07:58:06]

Should be one line above

[altimofeev, 2011/11/29 17:10:46]

Done.

 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
 #include "content/browser/webui/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // JS API callbacks names.
 const char kJsApiNetworkItemChosen[] = "networkItemChosen";
 const char kJsApiNetworkDropdownShow[] = "networkDropdownShow";
@@ skipping 39 matching lines @@
   DCHECK(args->GetSize() == 1);
   double id;
   if (!args->GetDouble(0, &id))
     NOTREACHED();
   DCHECK(dropdown_.get());
   dropdown_->OnItemChosen(static_cast<int>(id));
 }
 
 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();
   bool oobe;
   if (!args->GetBoolean(1, &oobe))
     NOTREACHED();
 
-  dropdown_.reset(new NetworkDropdown(web_ui_, GetNativeWindow(), oobe));
+
+  double last_network_type = -1;  // Javasript passes integer as double.

[whywhat, 2011/11/29 07:58:06]

typo: Javasript -> Javascript :)
Better to put comment on a separate line

[altimofeev, 2011/11/29 17:10:46]

Done.

+  if (!args->GetDouble(2, &last_network_type))
+    NOTREACHED();
+  if (last_network_type < 0)
+    last_network_type = TYPE_WIFI;
+
+  dropdown_.reset(new NetworkDropdown(web_ui_, GetNativeWindow(), oobe,
+      static_cast<ConnectionType>(last_network_type)));

[stevenjb, 2011/11/28 19:35:45]

Since this is the only place we might set last_network_type to something other
than WIFI, we can just call a setter here if >= 0.

[altimofeev, 2011/11/29 17:10:46]

Done.

 }
 
 void NetworkDropdownHandler::HandleNetworkDropdownHide(
     const base::ListValue* args) {
   DCHECK(args->GetSize() == 0);
   dropdown_.reset();
 }
 
 void NetworkDropdownHandler::HandleNetworkDropdownRefresh(
     const base::ListValue* args) {
   DCHECK(args->GetSize() == 0);
   // Since language change is async,
   // we may in theory be on another screen during this call.
   if (dropdown_.get())
     dropdown_->Refresh();
 }
 
 }  // namespace chromeos