chrome/browser/chromeos/status/network_menu_icon.cc - Issue 8681029: [cros] Make disconnected icons used by network drop-down and network button consistent.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/status/network_menu_icon.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/chromeos/status/network_menu_icon.h ('K') | « chrome/browser/chromeos/status/network_menu_icon.h ('k') | chrome/browser/chromeos/status/network_menu_icon_unittest.cc » ('j') | chrome/browser/resources/chromeos/login/network_dropdown.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/status/network_menu_icon.cc

diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc

index 8797bb76ce5de4404df8f6ccc968f8c53076f979..f9dd2a2e15ff39e33762effb199d26b671d09570 100644

--- a/chrome/browser/chromeos/status/network_menu_icon.cc

+++ b/chrome/browser/chromeos/status/network_menu_icon.cc

@@ -452,11 +452,12 @@ class NetworkIcon {

////////////////////////////////////////////////////////////////////////////////

// NetworkMenuIcon

-NetworkMenuIcon::NetworkMenuIcon(Delegate* delegate, Mode mode)

+NetworkMenuIcon::NetworkMenuIcon(Delegate* delegate, Mode mode,

+ ConnectionType last_network_type)

: mode_(mode),

delegate_(delegate),

ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)),

- last_network_type_(TYPE_WIFI),

+ last_network_type_(last_network_type),

connecting_network_(NULL) {

// Generate empty images for blending.

ResourceBundle& rb = ResourceBundle::GetSharedInstance();