| Index: chrome/browser/chromeos/net/onc_utils.h
|
| diff --git a/chrome/browser/chromeos/net/onc_utils.h b/chrome/browser/chromeos/net/onc_utils.h
|
| index e6a30f3ff0928f8c943550cba031dd2d476d9db6..3f6cae4cd3abb112e3d602a7a207a3d321a87215 100644
|
| --- a/chrome/browser/chromeos/net/onc_utils.h
|
| +++ b/chrome/browser/chromeos/net/onc_utils.h
|
| @@ -17,10 +17,13 @@ class DictionaryValue;
|
| class ListValue;
|
| }
|
|
|
| +namespace user_manager {
|
| +class User;
|
| +}
|
| +
|
| namespace chromeos {
|
|
|
| class NetworkState;
|
| -class User;
|
|
|
| namespace onc {
|
|
|
| @@ -38,10 +41,10 @@ scoped_ptr<base::DictionaryValue> ConvertOncProxySettingsToProxyConfig(
|
| // implemented, which are replaced by attributes of the logged-in user with
|
| // |hashed_username|.
|
| void ExpandStringPlaceholdersInNetworksForUser(
|
| - const chromeos::User* user,
|
| + const user_manager::User* user,
|
| base::ListValue* network_configs);
|
|
|
| -void ImportNetworksForUser(const chromeos::User* user,
|
| +void ImportNetworksForUser(const user_manager::User* user,
|
| const base::ListValue& network_configs,
|
| std::string* error);
|
|
|
|
|