Convert all connect code to use NetworkHandler instead of NetworkLibrary

chrome/browser/chromeos/enrollment_dialog_view.cc

 // 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.
 
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_navigator.h"
+#include "chromeos/network/network_event_log.h"
 #include "content/public/common/page_transition_types.h"
 #include "extensions/common/constants.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
@@ skipping 162 matching lines @@
 
 class DialogEnrollmentDelegate : public EnrollmentDelegate {
  public:
   // |owning_window| is the window that will own the dialog.
   explicit DialogEnrollmentDelegate(gfx::NativeWindow owning_window,
                                     const std::string& network_name,
                                     Profile* profile);
   virtual ~DialogEnrollmentDelegate();
 
   // EnrollmentDelegate overrides
-  virtual void Enroll(const std::vector<std::string>& uri_list,
+  virtual bool Enroll(const std::vector<std::string>& uri_list,
                       const base::Closure& connect) OVERRIDE;
 
  private:
   gfx::NativeWindow owning_window_;
   std::string network_name_;
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(DialogEnrollmentDelegate);
 };
 
 DialogEnrollmentDelegate::DialogEnrollmentDelegate(
     gfx::NativeWindow owning_window,
     const std::string& network_name,
     Profile* profile) : owning_window_(owning_window),
                         network_name_(network_name),
                         profile_(profile) {}
 
 DialogEnrollmentDelegate::~DialogEnrollmentDelegate() {}
 
-void DialogEnrollmentDelegate::Enroll(const std::vector<std::string>& uri_list,
-                                      const base::Closure& connect) {
+bool DialogEnrollmentDelegate::Enroll(const std::vector<std::string>& uri_list,
+                                      const base::Closure& post_action) {
   // Keep the closure for later activation if we notice that
   // a certificate has been added.
 
   // TODO(gspencer): Do something smart with the closure.  At the moment it is
   // being ignored because we don't know when the enrollment tab is closed.
   // http://crosbug.com/30422
   for (std::vector<std::string>::const_iterator iter = uri_list.begin();
        iter != uri_list.end(); ++iter) {
     GURL uri(*iter);
     if (uri.IsStandard() || uri.scheme() == extensions::kExtensionScheme) {
       // If this is a "standard" scheme, like http, ftp, etc., then open that in
       // the enrollment dialog.
       EnrollmentDialogView::ShowDialog(owning_window_,
                                        network_name_,
                                        profile_,
-                                       uri, connect);
-      return;
+                                       uri, post_action);
+      return true;
     }
   }
 
   // If we didn't find a scheme we could handle, then don't continue connecting.
   // TODO(gspencer): provide a path to display this failure to the user. (but
   // for the most part they won't know what it means, since it's probably coming

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

TODO comment obsolete now with the return value?

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

Done.

   // from a policy-pushed ONC file).
-  VLOG(1) << "Couldn't find usable scheme in enrollment URI(s)";
+  NET_LOG_EVENT("No usable enrollment URI", network_name_);
+  return false;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Factory function.
 
 EnrollmentDelegate* CreateEnrollmentDelegate(gfx::NativeWindow owning_window,
                                              const std::string& network_name,
                                              Profile* profile) {
   return new DialogEnrollmentDelegate(owning_window, network_name, profile);
 }
 
 }  // namespace chromeos