Changed VZ activation logic to always attempt OTA even for brand new devices.

chrome/browser/resources/chromeos/mobile_setup.js

 // 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.
 
 
 cr.define('mobile', function() {
 
   function MobileSetup() {
   }
 
@@ skipping 59 matching lines @@
       this.confirm_ = new cr.ui.dialogs.ConfirmDialog(document.body);
 
       window.addEventListener('message', function(e) {
           self.onMessageReceived_(e);
       });
 
       $('closeButton').addEventListener('click', function(e) {
         $('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});
       // Kick off activation process.
       chrome.send('startActivation');
     },
 
     startSpinner_: function() {
       this.stopSpinner_();
       this.spinnerInt_ = setInterval(mobile.MobileSetup.drawProgress, 100);
     },
 
@@ skipping 116 matching lines @@
           $('carrierPage').classList.add('hidden');
           $('paymentForm').classList.remove('hidden');
           $('closeButton').classList.remove('hidden');
           $('finalStatus').classList.remove('hidden');
           $('canvas').classList.add('hidden');
           this.stopSpinner_();
           if (this.paymentShown_) {
             $('closeButton').classList.remove('hidden');
           } else {
             $('closeButton').classList.add('hidden');
-            $('cancelButton').textContent =
-                MobileSetup.localStrings_.getString('close_button');
           }
           break;
         case MobileSetup.PLAN_ACTIVATION_ERROR:
           $('statusHeader').textContent = '';
           $('auxHeader').textContent = '';
           $('finalHeader').textContent =
               MobileSetup.localStrings_.getString('error_header');
           $('finalMessage').textContent = deviceInfo.error;
           $('systemStatus').classList.add('hidden');
           $('carrierPage').classList.add('hidden');
           $('paymentForm').classList.remove('hidden');
           $('canvas').classList.add('hidden');
           this.stopSpinner_();
           if (this.paymentShown_) {
             $('closeButton').classList.remove('hidden');
           } else {
             $('closeButton').classList.add('hidden');
-            $('cancelButton').textContent =
-                MobileSetup.localStrings_.getString('close_button');
           }
           $('finalStatus').classList.remove('hidden');
           break;
       }
       this.state_ = new_state;
     },
 
     updateDeviceStatus_: function(deviceInfo) {
       this.changeState_(deviceInfo);
     },
@@ skipping 89 matching lines @@
         mobile.MobileSetup.ACTIVATION_PAGE_URL);
   };
 
   // Export
   return {
     MobileSetup: MobileSetup
   };
 
 });