Prevent the Ctrl+Alt+E shortcut from cancelling from the normal enrollment screen too.

BUG=chromium-os:31897
TEST=Go into the manual enrollment screen by pressing Ctrl+Alt+E from the sign-in screen. Pressing Ctrl+Alt+E does NOT show a cancel dialog about auto enrollment.


Review URL: https://chromiumcodereview.appspot.com/10823057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149242 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js

@@ -252,6 +252,8 @@ cr.define('oobe', function() {
      * Handler for cancellations of an enforced auto-enrollment.
      */
     cancelAutoEnrollment: function() {
+      if (!this.isAutoEnrollment_)
+        return;
       if (!this.confirmDialog_) {
         this.confirmDialog_ = new cr.ui.dialogs.ConfirmDialog(document.body);
         this.confirmDialog_.setOkLabel(