| Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
|
| index 8d3b0e633a8b324c8bf39bd704523f3409d305bc..3b5c2b9fcb10ee8a7ed7265634b4013f8f20ae4b 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
|
| +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "chrome/browser/chromeos/cros/network_constants.h"
|
| +#include "chrome/browser/chromeos/cros/network_ip_config.h"
|
| #include "chrome/browser/chromeos/cros/network_library.h"
|
| #include "chrome/browser/chromeos/cros/network_ui_data.h"
|
| #include "chrome/browser/ui/webui/options/options_ui.h"
|
| @@ -126,9 +127,13 @@ class InternetOptionsHandler
|
| // This is the second half of PopulateDictionaryDetails after the asynchronous
|
| // request for Shill's service properties.
|
| void PopulateDictionaryDetailsCallback(
|
| - const chromeos::Network* network,
|
| const std::string& service_path,
|
| const base::DictionaryValue* shill_properties);
|
| + void PopulateIPConfigsCallback(
|
| + const std::string& service_path,
|
| + base::DictionaryValue* shill_properties,
|
| + const chromeos::NetworkIPConfigVector& ipconfigs,
|
| + const std::string& hardware_address);
|
| void PopulateWifiDetails(const chromeos::WifiNetwork* wifi,
|
| base::DictionaryValue* dictionary);
|
| void PopulateWimaxDetails(const chromeos::WimaxNetwork* wimax,
|
|
|