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

Side by Side Diff: chrome/browser/chromeos/status/network_menu.h

Issue 4102003: Do not require password for remembered wifi network. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/common
Patch Set: Untabify. Created 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ 6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 struct NetworkInfo { 54 struct NetworkInfo {
55 NetworkInfo() : need_passphrase(false), remembered(true) {} 55 NetworkInfo() : need_passphrase(false), remembered(true) {}
56 // "ethernet" | "wifi" | "cellular" | "other". 56 // "ethernet" | "wifi" | "cellular" | "other".
57 std::string network_type; 57 std::string network_type;
58 // "connected" | "connecting" | "disconnected" | "error". 58 // "connected" | "connecting" | "disconnected" | "error".
59 std::string status; 59 std::string status;
60 // status message or error message, empty if unknown status. 60 // status message or error message, empty if unknown status.
61 std::string message; 61 std::string message;
62 // IP address (if network is active, empty otherwise) 62 // IP address (if network is active, empty otherwise)
63 std::string ip_address; 63 std::string ip_address;
64 // Remembered passphrase.
65 std::string passphrase;
64 // true if the network requires a passphrase. 66 // true if the network requires a passphrase.
65 bool need_passphrase; 67 bool need_passphrase;
66 // true if the network is currently remembered. 68 // true if the network is currently remembered.
67 bool remembered; 69 bool remembered;
68 }; 70 };
69 71
70 NetworkMenu(); 72 NetworkMenu();
71 virtual ~NetworkMenu(); 73 virtual ~NetworkMenu();
72 74
73 // Retrieves network info for the DOMUI NetworkMenu (NetworkMenuUI). 75 // Retrieves network info for the DOMUI NetworkMenu (NetworkMenuUI).
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 210
209 // Holds minimum width or -1 if it wasn't set up. 211 // Holds minimum width or -1 if it wasn't set up.
210 int min_width_; 212 int min_width_;
211 213
212 DISALLOW_COPY_AND_ASSIGN(NetworkMenu); 214 DISALLOW_COPY_AND_ASSIGN(NetworkMenu);
213 }; 215 };
214 216
215 } // namespace chromeos 217 } // namespace chromeos
216 218
217 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ 219 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/dom_ui/network_menu_ui.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698