Convert all connect code to use NetworkHandler instead of NetworkLibrary

chrome/browser/chromeos/options/network_config_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
 
 #include <string>
 
 #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"
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace views {
 class ImageView;
@@ skipping 15 matching lines @@
     virtual void OnDialogAccepted() = 0;
 
     // Called when dialog "Cancel" button is pressed.
     virtual void OnDialogCancelled() = 0;
 
    protected:
      virtual ~Delegate() {}
   };
 
   // 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 ShowForPath(const std::string& path, gfx::NativeWindow parent);
+  static void Show(const std::string& service_path, gfx::NativeWindow parent);
+  static void ShowForType(const std::string& type, gfx::NativeWindow parent);

[pneubeck (no reviews), 2013/08/06 15:45:19]

mention what format |type| is of. referring to NetworkState::type() should be
enough.

[stevenjb, 2013/08/06 20:23:55]

Done.

 
   // Returns corresponding native window.
   gfx::NativeWindow GetNativeWindow() const;
 
   // views::DialogDelegate methods.
   virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
   virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual views::View* CreateExtraView() OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
 
   // views::WidgetDelegate methods.
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
 
   // views::View overrides.
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // views::ButtonListener overrides.
   virtual void ButtonPressed(
       views::Button* sender, const ui::Event& event) OVERRIDE;
 
   void set_delegate(Delegate* delegate) {
     delegate_ = delegate;
   }
 
-  static const base::DictionaryValue* FindPolicyForActiveUser(
-      const Network* network,
-      onc::ONCSource* onc_source);
-
  protected:
   // views::View overrides:
   virtual void Layout() OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void ViewHierarchyChanged(
       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);
 
   // Resets the underlying view to show advanced options.
   void ShowAdvancedView();
 
   // There's always only one child view, which will get deleted when
   // NetworkConfigView gets cleaned up.
   ChildNetworkConfigView* child_config_view_;
 
   Delegate* delegate_;
 
   // Button in lower-left corner, may be null or hidden.
   views::LabelButton* advanced_button_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConfigView);
 };
 
 // Children of NetworkConfigView must subclass this and implement the virtual
 // 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);

[pneubeck (no reviews), 2013/08/06 15:45:19]

mention that 'service_path' can be NULL, which means that a new network will be
configured.

[stevenjb, 2013/08/06 20:23:55]

Done.

+  virtual ~ChildNetworkConfigView();
 
   // Get the title to show for the dialog.
   virtual string16 GetTitle() const = 0;
 
   // Returns view that should be focused on dialog activation.
   virtual views::View* GetInitiallyFocusedView() = 0;
 
   // Called to determine if "Connect" button should be enabled.
   virtual bool CanLogin() = 0;
 
   // Called when "Connect" button is clicked.
   // Should return false if dialog should remain open.
   virtual bool Login() = 0;
 
   // Called when "Cancel" button is clicked.
   virtual void Cancel() = 0;
 
   // Called to set focus when view is recreated with the same dialog
   // being active. For example, clicking on "Advanced" button.
   virtual void InitFocus() = 0;
 
   // Minimum with of input fields / combo boxes.
   static const int kInputFieldMinWidth;
 
  protected:
+  NetworkConfigView* parent_;
   std::string service_path_;
-  NetworkConfigView* parent_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChildNetworkConfigView);
 };
 
 // Shows an icon with tooltip indicating whether a setting is under policy
 // control.
 class ControlledSettingIndicatorView : public views::View {
  public:
   ControlledSettingIndicatorView();
@@ skipping 18 matching lines @@
   views::ImageView* image_view_;
   const gfx::ImageSkia* gray_image_;
   const gfx::ImageSkia* color_image_;
 
   DISALLOW_COPY_AND_ASSIGN(ControlledSettingIndicatorView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_