| Index: extensions/shell/browser/shell_network_controller_chromeos.h
|
| diff --git a/apps/shell/browser/shell_network_controller_chromeos.h b/extensions/shell/browser/shell_network_controller_chromeos.h
|
| similarity index 87%
|
| rename from apps/shell/browser/shell_network_controller_chromeos.h
|
| rename to extensions/shell/browser/shell_network_controller_chromeos.h
|
| index 3e872da4dbd153c6874a860904639ab9fd3c1bd4..5299aa00e1afe474f71970b9ed98c4b4a4ade182 100644
|
| --- a/apps/shell/browser/shell_network_controller_chromeos.h
|
| +++ b/extensions/shell/browser/shell_network_controller_chromeos.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef APPS_SHELL_BROWSER_SHELL_NETWORK_CONTROLLER_CHROMEOS_H_
|
| -#define APPS_SHELL_BROWSER_SHELL_NETWORK_CONTROLLER_CHROMEOS_H_
|
| +#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_NETWORK_CONTROLLER_CHROMEOS_H_
|
| +#define EXTENSIONS_SHELL_BROWSER_SHELL_NETWORK_CONTROLLER_CHROMEOS_H_
|
|
|
| #include <string>
|
|
|
| @@ -15,7 +15,7 @@
|
| #include "base/values.h"
|
| #include "chromeos/network/network_state_handler_observer.h"
|
|
|
| -namespace apps {
|
| +namespace extensions {
|
|
|
| // Handles network-related tasks for app_shell on Chrome OS.
|
| class ShellNetworkController : public chromeos::NetworkStateHandlerObserver {
|
| @@ -59,9 +59,8 @@ class ShellNetworkController : public chromeos::NetworkStateHandlerObserver {
|
|
|
| // Handles a successful or failed connection attempt.
|
| void HandleConnectionSuccess();
|
| - void HandleConnectionError(
|
| - const std::string& error_name,
|
| - scoped_ptr<base::DictionaryValue> error_data);
|
| + void HandleConnectionError(const std::string& error_name,
|
| + scoped_ptr<base::DictionaryValue> error_data);
|
|
|
| // Current status of communication with the chromeos::NetworkStateHandler.
|
| // This is tracked to avoid sending duplicate requests before the handler has
|
| @@ -82,6 +81,6 @@ class ShellNetworkController : public chromeos::NetworkStateHandlerObserver {
|
| DISALLOW_COPY_AND_ASSIGN(ShellNetworkController);
|
| };
|
|
|
| -} // namespace apps
|
| +} // namespace extensions
|
|
|
| -#endif // APPS_SHELL_BROWSER_SHELL_NETWORK_CONTROLLER_CHROMEOS_H_
|
| +#endif // EXTENSIONS_SHELL_BROWSER_SHELL_NETWORK_CONTROLLER_CHROMEOS_H_
|
|
|