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

Side by Side Diff: chrome/browser/chromeos/dom_ui/internet_options_handler.h

Issue 4976007: Don't allow connection to networks that are not connected.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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_DOM_UI_INTERNET_OPTIONS_HANDLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_DOM_UI_INTERNET_OPTIONS_HANDLER_H_
6 #define CHROME_BROWSER_CHROMEOS_DOM_UI_INTERNET_OPTIONS_HANDLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_DOM_UI_INTERNET_OPTIONS_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "chrome/browser/chromeos/cros/network_library.h" 10 #include "chrome/browser/chromeos/cros/network_library.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 void PopulateDictionaryDetails(const chromeos::Network* net, 66 void PopulateDictionaryDetails(const chromeos::Network* net,
67 chromeos::NetworkLibrary* cros); 67 chromeos::NetworkLibrary* cros);
68 68
69 // Converts CellularDataPlan structure into dictionary for JS. Formats 69 // Converts CellularDataPlan structure into dictionary for JS. Formats
70 // plan settings into human readable texts. 70 // plan settings into human readable texts.
71 DictionaryValue* CellularDataPlanToDictionary( 71 DictionaryValue* CellularDataPlanToDictionary(
72 const chromeos::CellularDataPlan& plan); 72 const chromeos::CellularDataPlan& plan);
73 // Creates the map of a network 73 // Creates the map of a network
74 ListValue* GetNetwork(const std::string& service_path, const SkBitmap& icon, 74 ListValue* GetNetwork(const std::string& service_path, const SkBitmap& icon,
75 const std::string& name, bool connecting, bool connected, 75 const std::string& name, bool connecting, bool connected,
76 chromeos::ConnectionType connection_type, bool remembered, 76 bool connectable, chromeos::ConnectionType connection_type,
77 chromeos::ActivationState activation_state, bool restricted_ip); 77 bool remembered, chromeos::ActivationState activation_state,
78 bool restricted_ip);
78 79
79 // Creates the map of wired networks 80 // Creates the map of wired networks
80 ListValue* GetWiredList(); 81 ListValue* GetWiredList();
81 // Creates the map of wireless networks 82 // Creates the map of wireless networks
82 ListValue* GetWirelessList(); 83 ListValue* GetWirelessList();
83 // Creates the map of remembered networks 84 // Creates the map of remembered networks
84 ListValue* GetRememberedList(); 85 ListValue* GetRememberedList();
85 // Refresh the display of network information 86 // Refresh the display of network information
86 void RefreshNetworkData(chromeos::NetworkLibrary* cros); 87 void RefreshNetworkData(chromeos::NetworkLibrary* cros);
87 // Monitor the active network, if any 88 // Monitor the active network, if any
88 void MonitorActiveNetwork(chromeos::NetworkLibrary* cros); 89 void MonitorActiveNetwork(chromeos::NetworkLibrary* cros);
89 90
90 // If any network is currently active, this is its service path 91 // If any network is currently active, this is its service path
91 std::string active_network_; 92 std::string active_network_;
92 93
93 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler); 94 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
94 }; 95 };
95 96
96 #endif // CHROME_BROWSER_CHROMEOS_DOM_UI_INTERNET_OPTIONS_HANDLER_H_ 97 #endif // CHROME_BROWSER_CHROMEOS_DOM_UI_INTERNET_OPTIONS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698