| Index: chrome/browser/chromeos/options/network_config_view.h
|
| diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h
|
| index 0a8290b2665766a5d72fac054227a3d6b0e2da30..a24750a2b2289f19f6e3dfcacb18cbcc28979a46 100644
|
| --- a/chrome/browser/chromeos/options/network_config_view.h
|
| +++ b/chrome/browser/chromeos/options/network_config_view.h
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/strings/string16.h"
|
| -#include "chrome/browser/chromeos/cros/network_library.h"
|
| #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow
|
| #include "ui/views/controls/button/button.h" // views::ButtonListener
|
| #include "ui/views/window/dialog_delegate.h"
|
| @@ -45,8 +44,8 @@ class NetworkConfigView : public views::DialogDelegateView,
|
| };
|
|
|
| // Shows a network connection dialog if none is currently visible.
|
| - static void Show(Network* network, gfx::NativeWindow parent);
|
| - static void ShowForType(ConnectionType type, gfx::NativeWindow parent);
|
| + static void Show(const std::string& service_path, gfx::NativeWindow parent);
|
| + static void ShowForType(const std::string& type, gfx::NativeWindow parent);
|
|
|
| // Returns corresponding native window.
|
| gfx::NativeWindow GetNativeWindow() const;
|
| @@ -74,10 +73,6 @@ class NetworkConfigView : public views::DialogDelegateView,
|
| delegate_ = delegate;
|
| }
|
|
|
| - static const base::DictionaryValue* FindPolicyForActiveUser(
|
| - const Network* network,
|
| - onc::ONCSource* onc_source);
|
| -
|
| protected:
|
| // views::View overrides:
|
| virtual void Layout() OVERRIDE;
|
| @@ -86,11 +81,13 @@ class NetworkConfigView : public views::DialogDelegateView,
|
| const ViewHierarchyChangedDetails& details) OVERRIDE;
|
|
|
| private:
|
| + NetworkConfigView();
|
| + virtual ~NetworkConfigView();
|
| +
|
| // Login dialog for known networks.
|
| - explicit NetworkConfigView(Network* network);
|
| + void InitWithPath(const std::string& service_path);
|
| // Login dialog for new/hidden networks.
|
| - explicit NetworkConfigView(ConnectionType type);
|
| - virtual ~NetworkConfigView();
|
| + void InitWithType(const std::string& type);
|
|
|
| // Creates and shows a dialog containing this view.
|
| void ShowDialog(gfx::NativeWindow parent);
|
| @@ -114,12 +111,9 @@ class NetworkConfigView : public views::DialogDelegateView,
|
| // methods, which are called by NetworkConfigView.
|
| class ChildNetworkConfigView : public views::View {
|
| public:
|
| - ChildNetworkConfigView(NetworkConfigView* parent, Network* network)
|
| - : service_path_(network->service_path()),
|
| - parent_(parent) {}
|
| - explicit ChildNetworkConfigView(NetworkConfigView* parent)
|
| - : parent_(parent) {}
|
| - virtual ~ChildNetworkConfigView() {}
|
| + ChildNetworkConfigView(NetworkConfigView* parent,
|
| + const std::string& service_path);
|
| + virtual ~ChildNetworkConfigView();
|
|
|
| // Get the title to show for the dialog.
|
| virtual string16 GetTitle() const = 0;
|
| @@ -145,8 +139,8 @@ class ChildNetworkConfigView : public views::View {
|
| static const int kInputFieldMinWidth;
|
|
|
| protected:
|
| - std::string service_path_;
|
| NetworkConfigView* parent_;
|
| + std::string service_path_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ChildNetworkConfigView);
|
|
|