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

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

Issue 6516019: Made activate/buy button show consistently on network list and details pages.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/webui/internet_options_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_WEBUI_INTERNET_OPTIONS_HANDLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_WEBUI_INTERNET_OPTIONS_HANDLER_H_
6 #define CHROME_BROWSER_CHROMEOS_WEBUI_INTERNET_OPTIONS_HANDLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_WEBUI_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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // device. flimflam recognizes the string "SETTINGS:" to specify 74 // device. flimflam recognizes the string "SETTINGS:" to specify
75 // authentication parameters. 'key_id=' indicates that the certificate is 75 // authentication parameters. 'key_id=' indicates that the certificate is
76 // stored in a pkcs#11 device. 76 // stored in a pkcs#11 device.
77 // See src/third_party/flimflam/files/doc/service-api.txt. 77 // See src/third_party/flimflam/files/doc/service-api.txt.
78 bool IsCertificateInPkcs11(const std::string& path); 78 bool IsCertificateInPkcs11(const std::string& path);
79 79
80 // Populates the ui with the details of the given device path. This forces 80 // Populates the ui with the details of the given device path. This forces
81 // an overlay to be displayed in the UI. 81 // an overlay to be displayed in the UI.
82 void PopulateDictionaryDetails(const chromeos::Network* net, 82 void PopulateDictionaryDetails(const chromeos::Network* net,
83 chromeos::NetworkLibrary* cros); 83 chromeos::NetworkLibrary* cros);
84 void PopulateWifiDetails(DictionaryValue* dictionary, 84 void PopulateWifiDetails(const chromeos::WifiNetwork* wifi,
85 const chromeos::WifiNetwork* wifi); 85 DictionaryValue* dictionary);
86 void PopulateCellularDetails(DictionaryValue* dictionary, 86 void PopulateCellularDetails(const chromeos::CellularNetwork* cellular,
87 const chromeos::CellularNetwork* 87 DictionaryValue* dictionary);
88 cellular);
89 88
90 // Converts CellularDataPlan structure into dictionary for JS. Formats plan 89 // Converts CellularDataPlan structure into dictionary for JS. Formats plan
91 // settings into human readable texts. 90 // settings into human readable texts.
92 DictionaryValue* CellularDataPlanToDictionary( 91 DictionaryValue* CellularDataPlanToDictionary(
93 const chromeos::CellularDataPlan* plan); 92 const chromeos::CellularDataPlan* plan);
94 // Creates the map of a network. 93 // Creates the map of a network.
95 ListValue* GetNetwork(const std::string& service_path, 94 ListValue* GetNetwork(const std::string& service_path,
96 const SkBitmap& icon, 95 const SkBitmap& icon,
97 const std::string& name, 96 const std::string& name,
98 bool connecting, 97 bool connecting,
(...skipping 21 matching lines...) Expand all
120 void MonitorNetworks(chromeos::NetworkLibrary* cros); 119 void MonitorNetworks(chromeos::NetworkLibrary* cros);
121 120
122 // A boolean flag of whether to use WebUI for connect UI. True to use WebUI 121 // A boolean flag of whether to use WebUI for connect UI. True to use WebUI
123 // and false to use Views dialogs. 122 // and false to use Views dialogs.
124 bool use_settings_ui_; 123 bool use_settings_ui_;
125 124
126 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler); 125 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
127 }; 126 };
128 127
129 #endif // CHROME_BROWSER_CHROMEOS_WEBUI_INTERNET_OPTIONS_HANDLER_H_ 128 #endif // CHROME_BROWSER_CHROMEOS_WEBUI_INTERNET_OPTIONS_HANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/webui/internet_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698