Fix presubmit js style nits.

chrome/browser/resources/chromeos/mobile_setup.js

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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() {
   }
 
   cr.addSingletonGetter(MobileSetup);
 
-  MobileSetup.PLAN_ACTIVATION_PAGE_LOADING            = -1;

[zel, 2012/05/07 16:41:32]

why removing spaces here? how's the making the code more readable?

[Tyler Breisacher (Chromium), 2012/05/07 17:12:25]

This is required by the linter that runs as part of the presubmit. Do you think
we should turn off this rule, because of cases like this?

[Dan Beam, 2012/05/07 17:43:53]

http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml#Code_fo...

-  MobileSetup.PLAN_ACTIVATION_START                   = 0;
-  MobileSetup.PLAN_ACTIVATION_TRYING_OTASP            = 1;
-  MobileSetup.PLAN_ACTIVATION_RECONNECTING_OTASP_TRY  = 2;
-  MobileSetup.PLAN_ACTIVATION_INITIATING_ACTIVATION   = 3;
-  MobileSetup.PLAN_ACTIVATION_RECONNECTING            = 4;
-  MobileSetup.PLAN_ACTIVATION_PAYMENT_PORTAL_LOADING  = 5;
-  MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT         = 6;
-  MobileSetup.PLAN_ACTIVATION_RECONNECTING_PAYMENT    = 7;
-  MobileSetup.PLAN_ACTIVATION_DELAY_OTASP             = 8;
-  MobileSetup.PLAN_ACTIVATION_START_OTASP             = 9;
-  MobileSetup.PLAN_ACTIVATION_OTASP                   = 10;
-  MobileSetup.PLAN_ACTIVATION_RECONNECTING_OTASP      = 11;
-  MobileSetup.PLAN_ACTIVATION_DONE                    = 12;
-  MobileSetup.PLAN_ACTIVATION_ERROR                   = 0xFF;
+  MobileSetup.PLAN_ACTIVATION_PAGE_LOADING = -1;
+  MobileSetup.PLAN_ACTIVATION_START = 0;
+  MobileSetup.PLAN_ACTIVATION_TRYING_OTASP = 1;
+  MobileSetup.PLAN_ACTIVATION_RECONNECTING_OTASP_TRY = 2;
+  MobileSetup.PLAN_ACTIVATION_INITIATING_ACTIVATION = 3;
+  MobileSetup.PLAN_ACTIVATION_RECONNECTING = 4;
+  MobileSetup.PLAN_ACTIVATION_PAYMENT_PORTAL_LOADING = 5;
+  MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT = 6;
+  MobileSetup.PLAN_ACTIVATION_RECONNECTING_PAYMENT = 7;
+  MobileSetup.PLAN_ACTIVATION_DELAY_OTASP = 8;
+  MobileSetup.PLAN_ACTIVATION_START_OTASP = 9;
+  MobileSetup.PLAN_ACTIVATION_OTASP = 10;
+  MobileSetup.PLAN_ACTIVATION_RECONNECTING_OTASP = 11;
+  MobileSetup.PLAN_ACTIVATION_DONE = 12;
+  MobileSetup.PLAN_ACTIVATION_ERROR = 0xFF;
 
   MobileSetup.EXTENSION_PAGE_URL =
       'chrome-extension://iadeocfgjdjdmpenejdbfeaocpbikmab';
   MobileSetup.ACTIVATION_PAGE_URL = MobileSetup.EXTENSION_PAGE_URL +
                                     '/activation.html';
   MobileSetup.REDIRECT_POST_PAGE_URL = MobileSetup.EXTENSION_PAGE_URL +
                                        '/redirect.html';
 
   MobileSetup.localStrings_ = new LocalStrings();
 
   MobileSetup.prototype = {
     // Mobile device information.
     deviceInfo_: null,
-    frameName_ : '',
-    initialized_ : false,
-    faked_transaction_ : false,
-    payment_shown_ : false,
-    frame_load_error_ : 0,
-    frame_load_ignored_ : true,
+    frameName_: '',
+    initialized_: false,
+    faked_transaction_: false,

[arv (Not doing code reviews), 2012/05/07 17:26:03]

no underscores in JS names

[kmadhusu, 2012/05/08 20:20:19]

Done.

+    payment_shown_: false,
+    frame_load_error_: 0,
+    frame_load_ignored_: true,
     spinner_int_: -1,
     // UI states.
-    state_ : -1,
-    STATE_UNKNOWN_: "unknown",
-    STATE_CONNECTING_: "connecting",
-    STATE_ERROR_: "error",
-    STATE_PAYMENT_: "payment",
-    STATE_ACTIVATING_: "activating",
-    STATE_CONNECTED_: "connected",
+    state_: -1,
+    STATE_UNKNOWN_: 'unknown',
+    STATE_CONNECTING_: 'connecting',
+    STATE_ERROR_: 'error',
+    STATE_PAYMENT_: 'payment',
+    STATE_ACTIVATING_: 'activating',
+    STATE_CONNECTED_: 'connected',
 
     initialize: function(frame_name, carrierPage) {
       if (this.initialized_) {
         console.log('calling initialize() again?');
         return;
       }
       this.initialized_ = true;
       self = this;
       this.frameName_ = frame_name;
 
@@ skipping 18 matching lines @@
           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', []);
+      chrome.send('startActivation');
     },
 
-    startSpinner_:function() {
+    startSpinner_: function() {
       this.stopSpinner_();
       this.spinner_int_ = setInterval(mobile.MobileSetup.drawProgress, 100);
     },
 
-    stopSpinner_:function() {
+    stopSpinner_: function() {
       if (this.spinner_int_ != -1) {
         clearInterval(this.spinner_int_);
         this.spinner_int_ = -1;
       }
     },
 
     onFrameLoaded_: function(success) {
       chrome.send('paymentPortalLoad', [success ? 'ok' : 'failed']);
     },
 
@@ skipping 32 matching lines @@
         chrome.send('setTransactionStatus', [e.data.status]);
       }
     },
 
     changeState_: function(deviceInfo) {
       var new_state = deviceInfo.state;
       if (this.state_ == new_state)
         return;
       var main = $('mainbody');
       // Map handler state to UX.
-      switch(new_state) {
+      switch (new_state) {
         case MobileSetup.PLAN_ACTIVATION_PAGE_LOADING:
         case MobileSetup.PLAN_ACTIVATION_START:
         case MobileSetup.PLAN_ACTIVATION_DELAY_OTASP:
         case MobileSetup.PLAN_ACTIVATION_START_OTASP:
         case MobileSetup.PLAN_ACTIVATION_RECONNECTING:
         case MobileSetup.PLAN_ACTIVATION_RECONNECTING_PAYMENT:
         case MobileSetup.PLAN_ACTIVATION_RECONNECTING_OTASP_TRY:
         case MobileSetup.PLAN_ACTIVATION_RECONNECTING_OTASP:
           $('statusHeader').textContent =
               MobileSetup.localStrings_.getString('connecting_header');
@@ skipping 87 matching lines @@
       this.state_ = new_state;
     },
 
     updateDeviceStatus_: function(deviceInfo) {
       this.changeState_(deviceInfo);
     },
 
     portalFrameLoadError_: function(errorCode) {
       if (this.frame_load_ignored_)
         return;
-      console.log("Portal frame load error detected: " + errorCode);
+      console.log('Portal frame load error detected: ' + errorCode);

[Tyler Breisacher (Chromium), 2012/05/07 17:12:25]

It's often a good idea to change this kind of thing to:

console.log('Portal frame load error detected: ', errorCode);

because then the console can display errorCode in a more useful way, if
errorCode is an object, or a DOM element or something. In this case, it's just a
number (I would assume) so it doesn't really matter, but just fyi if you see
other console.log calls you want to fix up...

[kmadhusu, 2012/05/08 20:20:19]

Done.

       this.frame_load_error_ = errorCode;
     },
 
     portalFrameLoadCompleted_: function() {
       if (this.frame_load_ignored_)
         return;
-      console.log("Portal frame load completed!");
+      console.log('Portal frame load completed!');
       this.onFrameLoaded_(this.frame_load_error_ == 0);
     },
 
-    sendPostFrame_ : function(frameUrl) {
+    sendPostFrame_: function(frameUrl) {
       var msg = { type: 'postFrame' };
       $(this.frameName_).contentWindow.postMessage(msg, frameUrl);
     },
 
-    sendDeviceInfo_ : function() {
+    sendDeviceInfo_: function() {
       var msg = {
         type: 'deviceInfoMsg',
         domain: document.location,
         payload: {
           'carrier': this.deviceInfo_.carrier,
           'MEID': this.deviceInfo_.MEID,
           'IMEI': this.deviceInfo_.IMEI,
           'MDN': this.deviceInfo_.MDN
         }
       };
       $(this.frameName_).contentWindow.postMessage(msg,
           this.deviceInfo_.payment_url);
     }
 
   };
 
-  MobileSetup.drawProgress = function () {
+  MobileSetup.drawProgress = function() {
     var ctx = canvas.getContext('2d');
     ctx.clearRect(0, 0, canvas.width, canvas.height);
 
-    var segmentCount = Math.min(12, canvas.width/1.6) // Number of segments
+    var segmentCount = Math.min(12, canvas.width / 1.6); // Number of segments
     var rotation = 0.75; // Counterclockwise rotation
 
     // Rotate canvas over time
-    ctx.translate(canvas.width/2, canvas.height/2);
+    ctx.translate(canvas.width / 2, canvas.height / 2);
     ctx.rotate(Math.PI * 2 / (segmentCount + rotation));
-    ctx.translate(-canvas.width/2, -canvas.height/2);
+    ctx.translate(-canvas.width / 2, -canvas.height / 2);
 
     var gap = canvas.width / 24; // Gap between segments
-    var oRadius = canvas.width/2; // Outer radius
+    var oRadius = canvas.width / 2; // Outer radius
     var iRadius = oRadius * 0.618; // Inner radius
     var oCircumference = Math.PI * 2 * oRadius; // Outer circumference
     var iCircumference = Math.PI * 2 * iRadius; // Inner circumference
     var oGap = gap / oCircumference; // Gap size as fraction of  outer ring
     var iGap = gap / iCircumference; // Gap size as fraction of  inner ring
-    var oArc = Math.PI * 2 * ( 1 / segmentCount - oGap); // Angle of outer arcs
-    var iArc = Math.PI * 2 * ( 1 / segmentCount - iGap); // Angle of inner arcs
+    var oArc = Math.PI * 2 * (1 / segmentCount - oGap); // Angle of outer arcs
+    var iArc = Math.PI * 2 * (1 / segmentCount - iGap); // Angle of inner arcs
 
-    for (i = 0; i < segmentCount; i++){ // Draw each segment
+    for (i = 0; i < segmentCount; i++) { // Draw each segment
       var opacity = Math.pow(1.0 - i / segmentCount, 3.0);
-      opacity = (0.15 + opacity * 0.8) // Vary from 0.15 to 0.95
+      opacity = (0.15 + opacity * 0.8); // Vary from 0.15 to 0.95
       var angle = - Math.PI * 2 * i / segmentCount;
 
       ctx.beginPath();
-      ctx.arc(canvas.width/2, canvas.height/2, oRadius,
-        angle - oArc/2, angle + oArc/2, false);
-      ctx.arc(canvas.width/2, canvas.height/2, iRadius,
-        angle + iArc/2, angle - iArc/2, true);
+      ctx.arc(canvas.width / 2, canvas.height / 2, oRadius,
+        angle - oArc / 2, angle + oArc / 2, false);
+      ctx.arc(canvas.width / 2, canvas.height / 2, iRadius,
+        angle + iArc / 2, angle - iArc / 2, true);
       ctx.closePath();
-      ctx.fillStyle = "rgba(240, 30, 29, " + opacity + ")";
+      ctx.fillStyle = 'rgba(240, 30, 29, ' + opacity + ')';
       ctx.fill();
     }
   };
 
   MobileSetup.deviceStateChanged = function(deviceInfo) {
     MobileSetup.getInstance().updateDeviceStatus_(deviceInfo);
   };
 
   MobileSetup.portalFrameLoadError = function(errorCode) {
     MobileSetup.getInstance().portalFrameLoadError_(errorCode);
   };
 
   MobileSetup.portalFrameLoadCompleted = function() {
     MobileSetup.getInstance().portalFrameLoadCompleted_();
   };
 
   MobileSetup.loadPage = function() {
     mobile.MobileSetup.getInstance().initialize('paymentForm',
         mobile.MobileSetup.ACTIVATION_PAGE_URL);
   };
 
   // Export
   return {
     MobileSetup: MobileSetup
   };
 
 });