Moved mobile activation into its own modal dialog

chrome/browser/resources/mobile_setup.js

Index: chrome/browser/resources/mobile_setup.js
===================================================================
--- chrome/browser/resources/mobile_setup.js	(revision 106060)
+++ chrome/browser/resources/mobile_setup.js	(working copy)
@@ -50,6 +50,7 @@
     STATE_CONNECTED_: "connected",
 
     initialize: function(frame_name, carrierPage) {
+      this.confirm_ = new cr.ui.dialogs.ConfirmDialog(document.body);
       if (this.initialized_) {
         console.log('calling initialize() again?');
         return;
@@ -57,13 +58,27 @@
       this.initialized_ = true;
       self = this;
       this.frameName_ = frame_name;
+
       window.addEventListener('message', function(e) {
           self.onMessageReceived_(e);
       });
+
       $('closeButton').addEventListener('click', function(e) {
-          $('finalStatus').classList.add('hidden');
+        $('finalStatus').classList.add('hidden');
       });
 
+      $('cancelButton').addEventListener('click', function(e) {
+        if (self.state_ == MobileSetup.PLAN_ACTIVATION_DONE ||
+            self.state_ == MobileSetup.PLAN_ACTIVATION_ERROR) {
+          window.close();
+          return;
+        }
+        self.confirm_.show(
+          MobileSetup.localStrings_.getString('cancel_question'), function() {
+            window.close();
+        });
+      });
+
       this.changeState_({state: MobileSetup.PLAN_ACTIVATION_PAGE_LOADING});
       setInterval(mobile.MobileSetup.drawProgress, 100);
       // Kick off activation process.
@@ -181,10 +196,13 @@
           $('paymentForm').classList.remove('hidden');
           $('closeButton').classList.remove('hidden');
           $('finalStatus').classList.remove('hidden');
-          if (this.payment_shown_)
+          if (this.payment_shown_) {
             $('closeButton').classList.remove('hidden');
-          else
+          } else {
             $('closeButton').classList.add('hidden');
+            $('cancelButton').textContent =
+                MobileSetup.localStrings_.getString('close_button');
+          }
           break;
         case MobileSetup.PLAN_ACTIVATION_ERROR:
           $('statusHeader').textContent = '';
@@ -196,10 +214,13 @@
           $('canvas').classList.add('hidden');
           $('carrierPage').classList.add('hidden');
           $('paymentForm').classList.remove('hidden');
-          if (this.payment_shown_)
+          if (this.payment_shown_) {
             $('closeButton').classList.remove('hidden');
-          else
+          } else {
             $('closeButton').classList.add('hidden');
+            $('cancelButton').textContent =
+                MobileSetup.localStrings_.getString('close_button');
+          }
           $('finalStatus').classList.remove('hidden');
           break;
       }