Switch over MobileActivator to use Network*Handler

chrome/browser/ui/webui/chromeos/mobile_setup_dialog.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/ui/webui/chromeos/mobile_setup_dialog.h"
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/chromeos/mobile/mobile_activator.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/widget.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 
-using chromeos::CellularNetwork;
 using chromeos::MobileActivator;
 using content::BrowserThread;
 using content::WebContents;
 using content::WebUIMessageHandler;
 using ui::WebDialogDelegate;
 
 class MobileSetupDialogDelegate : public WebDialogDelegate,
                                   public MobileActivator::Observer {
  public:
   static MobileSetupDialogDelegate* GetInstance();
@@ skipping 20 matching lines @@
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
   virtual void OnCloseContents(WebContents* source,
                                bool* out_close_dialog) OVERRIDE;
   virtual bool ShouldShowDialogTitle() const OVERRIDE;
   virtual bool HandleContextMenu(
       const content::ContextMenuParams& params) OVERRIDE;
 
   // MobileActivator::Observer overrides.
   virtual void OnActivationStateChanged(
-      CellularNetwork* network,
+      const chromeos::NetworkState* network,
       MobileActivator::PlanActivationState state,
       const std::string& error_description) OVERRIDE;
 
  private:
   gfx::NativeWindow dialog_window_;
   // Cellular network service path.
   std::string service_path_;
   DISALLOW_COPY_AND_ASSIGN(MobileSetupDialogDelegate);
 };
 
@@ skipping 95 matching lines @@
 bool MobileSetupDialogDelegate::ShouldShowDialogTitle() const {
   return true;
 }
 
 bool MobileSetupDialogDelegate::HandleContextMenu(
     const content::ContextMenuParams& params) {
   return true;
 }
 
 void MobileSetupDialogDelegate::OnActivationStateChanged(
-    CellularNetwork* network,
+    const chromeos::NetworkState* network,
     MobileActivator::PlanActivationState state,
     const std::string& error_description) {

[stevenjb, 2013/08/14 02:28:31]

Since this does nothing is there any point in implementing it, or even observing
MobileActivator?

[gauravsh, 2013/08/14 21:42:29]

Yeah, I am not sure why this was observing MobileActivator in the first place.
Removed.

 }