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.

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: default 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

« chrome/browser/ui/webui/chromeos/login/network_dropdown.h ('K') | « chrome/browser/ui/webui/chromeos/login/network_dropdown.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..7c2bce22f0c7c6f09bece9d42b4c68bba782fbc0 100644

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

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

@@ -6,7 +6,9 @@

#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"

@@ -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,15 @@ void NetworkDropdownHandler::HandleNetworkDropdownShow(

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 com

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_net

altimofeev 2011/11/29 17:10:46 Done.

}

void NetworkDropdownHandler::HandleNetworkDropdownHide(