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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.h

Issue 11829015: Add the ability to activate for carriers that need to be directly activated. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 void NetworkCommandCallback(const base::ListValue* args); 73 void NetworkCommandCallback(const base::ListValue* args);
74 74
75 // Helper functions called by NetworkCommandCallback(...) 75 // Helper functions called by NetworkCommandCallback(...)
76 void AddConnection(chromeos::ConnectionType type); 76 void AddConnection(chromeos::ConnectionType type);
77 void ConnectToNetwork(chromeos::Network* network); 77 void ConnectToNetwork(chromeos::Network* network);
78 78
79 // Used to finish up async connection to the |network|. |network| cannot 79 // Used to finish up async connection to the |network|. |network| cannot
80 // be NULL. 80 // be NULL.
81 void DoConnect(chromeos::Network* network); 81 void DoConnect(chromeos::Network* network);
82 82
83 void SetActivationButtonVisibility( 83 void SetCellularButtonsVisibility(
84 const chromeos::CellularNetwork* cellular, 84 const chromeos::CellularNetwork* cellular,
85 base::DictionaryValue* dictionary, 85 base::DictionaryValue* dictionary,
86 const std::string& carrier_id); 86 const std::string& carrier_id);
87 87
88 void SetServerHostnameCallback(const base::ListValue* args); 88 void SetServerHostnameCallback(const base::ListValue* args);
89 void SetPreferNetworkCallback(const base::ListValue* args); 89 void SetPreferNetworkCallback(const base::ListValue* args);
90 void SetAutoConnectCallback(const base::ListValue* args); 90 void SetAutoConnectCallback(const base::ListValue* args);
91 void SetSharedCallback(const base::ListValue* args); 91 void SetSharedCallback(const base::ListValue* args);
92 void SetIPConfigCallback(const base::ListValue* args); 92 void SetIPConfigCallback(const base::ListValue* args);
93 void EnableWifiCallback(const base::ListValue* args); 93 void EnableWifiCallback(const base::ListValue* args);
(...skipping 22 matching lines...) Expand all
116 // an overlay to be displayed in the UI. Called after the asynchronous 116 // an overlay to be displayed in the UI. Called after the asynchronous
117 // request for Shill's service properties. 117 // request for Shill's service properties.
118 void PopulateDictionaryDetailsCallback( 118 void PopulateDictionaryDetailsCallback(
119 const std::string& service_path, 119 const std::string& service_path,
120 const base::DictionaryValue* shill_properties); 120 const base::DictionaryValue* shill_properties);
121 void PopulateIPConfigsCallback( 121 void PopulateIPConfigsCallback(
122 const std::string& service_path, 122 const std::string& service_path,
123 base::DictionaryValue* shill_properties, 123 base::DictionaryValue* shill_properties,
124 const chromeos::NetworkIPConfigVector& ipconfigs, 124 const chromeos::NetworkIPConfigVector& ipconfigs,
125 const std::string& hardware_address); 125 const std::string& hardware_address);
126 void PopulateConnectionDetails(const chromeos::Network* network,
127 base::DictionaryValue* dictionary);
Evan Stade 2013/01/09 23:24:08 indent
rkc 2013/01/09 23:34:35 Done.
126 void PopulateWifiDetails(const chromeos::WifiNetwork* wifi, 128 void PopulateWifiDetails(const chromeos::WifiNetwork* wifi,
127 base::DictionaryValue* dictionary); 129 base::DictionaryValue* dictionary);
128 void PopulateWimaxDetails(const chromeos::WimaxNetwork* wimax, 130 void PopulateWimaxDetails(const chromeos::WimaxNetwork* wimax,
129 base::DictionaryValue* dictionary); 131 base::DictionaryValue* dictionary);
130 void PopulateCellularDetails(const chromeos::CellularNetwork* cellular, 132 void PopulateCellularDetails(const chromeos::CellularNetwork* cellular,
131 base::DictionaryValue* dictionary); 133 base::DictionaryValue* dictionary);
132 134
133 // Converts CellularApn stuct into dictionary for JS. 135 // Converts CellularApn stuct into dictionary for JS.
134 base::DictionaryValue* CreateDictionaryFromCellularApn( 136 base::DictionaryValue* CreateDictionaryFromCellularApn(
135 const chromeos::CellularApn& apn); 137 const chromeos::CellularApn& apn);
136 138
137 // Creates the map of wired networks. 139 // Creates the map of wired networks.
138 base::ListValue* GetWiredList(); 140 base::ListValue* GetWiredList();
139 // Creates the map of wireless networks. 141 // Creates the map of wireless networks.
140 base::ListValue* GetWirelessList(); 142 base::ListValue* GetWirelessList();
141 // Creates the map of virtual networks. 143 // Creates the map of virtual networks.
142 base::ListValue* GetVPNList(); 144 base::ListValue* GetVPNList();
143 // Creates the map of remembered networks. 145 // Creates the map of remembered networks.
144 base::ListValue* GetRememberedList(); 146 base::ListValue* GetRememberedList();
145 // Fills network information into JS dictionary for displaying network lists. 147 // Fills network information into JS dictionary for displaying network lists.
146 void FillNetworkInfo(base::DictionaryValue* dictionary); 148 void FillNetworkInfo(base::DictionaryValue* dictionary);
147 // Refreshes the display of network information. 149 // Refreshes the display of network information.
148 void RefreshNetworkData(); 150 void RefreshNetworkData();
151 // Updates the display of network connection
Evan Stade 2013/01/09 23:24:08 wrap at 80
rkc 2013/01/09 23:34:35 Done.
152 // information for the details page if it's up.
153 void UpdateConnectionData(const chromeos::Network* network);
149 // Updates the carrier change status. 154 // Updates the carrier change status.
150 void UpdateCarrier(bool success); 155 void UpdateCarrier(bool success);
151 // Adds observers for wireless networks, if any, so that we can dynamically 156 // Adds observers for wireless networks, if any, so that we can dynamically
152 // display the correct icon for that network's signal strength and, in the 157 // display the correct icon for that network's signal strength and, in the
153 // case of cellular networks, network technology and roaming status. 158 // case of cellular networks, network technology and roaming status.
154 void MonitorNetworks(); 159 void MonitorNetworks();
155 160
156 // Callback for SetCarrier to notify once it's complete. 161 // Callback for SetCarrier to notify once it's complete.
157 void CarrierStatusCallback( 162 void CarrierStatusCallback(
158 const std::string& path, 163 const std::string& path,
(...skipping 12 matching lines...) Expand all
171 // without worrying that they will actually try to happen after the lifetime 176 // without worrying that they will actually try to happen after the lifetime
172 // of this object. 177 // of this object.
173 base::WeakPtrFactory<InternetOptionsHandler> weak_factory_; 178 base::WeakPtrFactory<InternetOptionsHandler> weak_factory_;
174 179
175 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler); 180 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
176 }; 181 };
177 182
178 } // namespace options 183 } // namespace options
179 184
180 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_ 185 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698