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

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

Issue 4169001: Rewritten parts of NetworkLibrary to work around memory corruption that prev... (Closed) Base URL: svn://svn.chromium.org/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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void EnableWifiCallback(const ListValue* args); 49 void EnableWifiCallback(const ListValue* args);
50 void DisableWifiCallback(const ListValue* args); 50 void DisableWifiCallback(const ListValue* args);
51 void EnableCellularCallback(const ListValue* args); 51 void EnableCellularCallback(const ListValue* args);
52 void DisableCellularCallback(const ListValue* args); 52 void DisableCellularCallback(const ListValue* args);
53 void BuyDataPlanCallback(const ListValue* args); 53 void BuyDataPlanCallback(const ListValue* args);
54 54
55 bool is_certificate_in_pkcs11(const std::string& path); 55 bool is_certificate_in_pkcs11(const std::string& path);
56 56
57 // Populates the ui with the details of the given device path. This forces 57 // Populates the ui with the details of the given device path. This forces
58 // an overlay to be displayed in the UI. 58 // an overlay to be displayed in the UI.
59 void PopulateDictionaryDetails(const chromeos::Network& net, 59 void PopulateDictionaryDetails(const chromeos::Network* net,
60 chromeos::NetworkLibrary* cros); 60 chromeos::NetworkLibrary* cros);
61 61
62 void PopupWirelessPassword(const chromeos::WifiNetwork& network); 62 void PopupWirelessPassword(const chromeos::WifiNetwork* network);
63 63
64 // Converts CellularDataPlan structure into dictionary for JS. Formats 64 // Converts CellularDataPlan structure into dictionary for JS. Formats
65 // plan settings into human readable texts. 65 // plan settings into human readable texts.
66 DictionaryValue* CellularDataPlanToDictionary( 66 DictionaryValue* CellularDataPlanToDictionary(
67 const chromeos::CellularDataPlan& plan); 67 const chromeos::CellularDataPlan& plan);
68 // Evaluates cellular plans status and returns warning string if it is near 68 // Evaluates cellular plans status and returns warning string if it is near
69 // expiration. 69 // expiration.
70 string16 GetPlanWarning( 70 string16 GetPlanWarning(
71 const chromeos::CellularDataPlan& plan); 71 const chromeos::CellularDataPlan& plan);
72 // Creates the map of a network 72 // Creates the map of a network
73 ListValue* GetNetwork(const std::string& service_path, const SkBitmap& icon, 73 ListValue* GetNetwork(const std::string& service_path, const SkBitmap& icon,
74 const std::string& name, bool connecting, bool connected, 74 const std::string& name, bool connecting, bool connected,
75 chromeos::ConnectionType connection_type, bool remembered, 75 chromeos::ConnectionType connection_type, bool remembered,
76 chromeos::ActivationState activation_state); 76 chromeos::ActivationState activation_state);
77 77
78 // Creates the map of wired networks 78 // Creates the map of wired networks
79 ListValue* GetWiredList(); 79 ListValue* GetWiredList();
80 // Creates the map of wireless networks 80 // Creates the map of wireless networks
81 ListValue* GetWirelessList(); 81 ListValue* GetWirelessList();
82 // Creates the map of remembered networks 82 // Creates the map of remembered networks
83 ListValue* GetRememberedList(); 83 ListValue* GetRememberedList();
84 84
85 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler); 85 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
86 }; 86 };
87 87
88 #endif // CHROME_BROWSER_CHROMEOS_DOM_UI_INTERNET_OPTIONS_HANDLER_H_ 88 #endif // CHROME_BROWSER_CHROMEOS_DOM_UI_INTERNET_OPTIONS_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/dom_ui/internet_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698