Revert of Make pause-on-exceptions toggle/tri-state button.

Source/devtools/front_end/SourcesPanel.js

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 196 matching lines @@
             return;
 
         event.returnValue = WebInspector.UIString("DevTools have unsaved changes that will be permanently lost.");
         WebInspector.showPanel("sources");
         for (var i = 0; i < unsavedSourceCodes.length; ++i)
             WebInspector.panels.sources.showUISourceCode(unsavedSourceCodes[i]);
     }
     window.addEventListener("beforeunload", handleBeforeUnload.bind(this), true);
 }
 
-/** @type {!Array.<!WebInspector.DebuggerModel.PauseOnExceptionsState>} */
-WebInspector.SourcesPanel.PauseOnExceptionsStates = [
-    WebInspector.DebuggerModel.PauseOnExceptionsState.DontPauseOnExceptions,
-    WebInspector.DebuggerModel.PauseOnExceptionsState.PauseOnUncaughtExceptions,
-    WebInspector.DebuggerModel.PauseOnExceptionsState.PauseOnAllExceptions
-];
-
 WebInspector.SourcesPanel.prototype = {
     /**
      * @return {!Element}
      */
     defaultFocusedElement: function()
     {
         return this._editorContainer.view.defaultFocusedElement() || this._navigator.view.defaultFocusedElement();
     },
 
     get paused()
@@ skipping 489 matching lines @@
         if (sourceFrame && (!this._navigatorController.isNavigatorPinned() || event.data.focusSource))
             sourceFrame.focus();
     },
 
     _itemSearchStarted: function(event)
     {
         var searchText = /** @type {string} */ (event.data);
         WebInspector.OpenResourceDialog.show(this, this.editorView.mainElement(), searchText);
     },
 
-    /**
-     * @return {!Array.<!WebInspector.StatusBarButton>}
-     */
-    _createPauseOnExceptionOptions: function()
-    {
-        this._pauseOnExceptionButton.title = this._pauseOnExceptionStateTitle(this._pauseOnExceptionButton.state);
-        var excludedOption = this._pauseOnExceptionButton.state;
-        var pauseStates = WebInspector.SourcesPanel.PauseOnExceptionsStates.slice(0);
-        var options = [];
-        for (var i = 0; i < pauseStates.length; ++i) {
-            if (pauseStates[i] === excludedOption)
-                continue;
-            var button = new WebInspector.StatusBarButton("", "scripts-pause-on-exceptions-status-bar-item", 3);
-            button.addEventListener("click", this._togglePauseOnExceptions, this);
-            button.state = pauseStates[i];
-            button.title = this._pauseOnExceptionStateTitle(pauseStates[i]);
-            options.push(button);
-        }
-        return options;
-    },
-
     _pauseOnExceptionStateChanged: function()
     {
-        var state = WebInspector.settings.pauseOnExceptionStateString.get();
-        var nextState;
-        if (state === WebInspector.DebuggerModel.PauseOnExceptionsState.DontPauseOnExceptions)
-            nextState = WebInspector.settings.lastPauseOnExceptionState.get();
-        else
-            nextState = WebInspector.DebuggerModel.PauseOnExceptionsState.DontPauseOnExceptions;
-        this._pauseOnExceptionButton.title = this._pauseOnExceptionStateTitle(state, nextState);
-        this._pauseOnExceptionButton.state = state;
-    },
-
-    /**
-     * @param {!WebInspector.DebuggerModel.PauseOnExceptionsState} state
-     * @param {!WebInspector.DebuggerModel.PauseOnExceptionsState=} nextState
-     * @return {string}
-     */
-    _pauseOnExceptionStateTitle: function(state, nextState)
-    {
-        var states = WebInspector.DebuggerModel.PauseOnExceptionsState;
-        var stateDescription;
-        if (state === states.DontPauseOnExceptions) {
-            stateDescription = WebInspector.UIString("Don't pause on exceptions.");
-        } else if (state === states.PauseOnAllExceptions) {
-            stateDescription = WebInspector.UIString("Pause on exceptions, including caught exceptions.");
-        } else if (state === states.PauseOnUncaughtExceptions) {
-            stateDescription = WebInspector.UIString("Pause on exceptions.");
-        } else {
-            throw "Unexpected state: " + state;
+        var pauseOnExceptionsState = WebInspector.settings.pauseOnExceptionStateString.get();
+        switch (pauseOnExceptionsState) {
+        case WebInspector.DebuggerModel.PauseOnExceptionsState.DontPauseOnExceptions:
+            this._pauseOnExceptionButton.title = WebInspector.UIString("Don't pause on exceptions.\nClick to Pause on all exceptions.");
+            break;
+        case WebInspector.DebuggerModel.PauseOnExceptionsState.PauseOnAllExceptions:
+            this._pauseOnExceptionButton.title = WebInspector.UIString("Pause on all exceptions.\nClick to Pause on uncaught exceptions.");
+            break;
+        case WebInspector.DebuggerModel.PauseOnExceptionsState.PauseOnUncaughtExceptions:
+            this._pauseOnExceptionButton.title = WebInspector.UIString("Pause on uncaught exceptions.\nClick to Not pause on exceptions.");
+            break;
         }
-        var nextStateDescription;
-        if (nextState === states.DontPauseOnExceptions) {
-            nextStateDescription = WebInspector.UIString("Click to Not pause on exceptions.");
-        } else if (nextState === states.PauseOnAllExceptions) {
-            nextStateDescription = WebInspector.UIString("Click to Pause on exceptions, including caught exceptions.");
-        } else if (nextState === states.PauseOnUncaughtExceptions) {
-            nextStateDescription = WebInspector.UIString("Click to Pause on exceptions.");
-        }
-        return nextState ? String.sprintf("%s\n%s", stateDescription, nextStateDescription) : stateDescription;
+        this._pauseOnExceptionButton.state = pauseOnExceptionsState;
     },
 
     _updateDebuggerButtons: function()
     {
         if (this._paused) {
             this._updateButtonTitle(this._pauseButton, WebInspector.UIString("Resume script execution (%s)."))
             this._pauseButton.state = true;
             this._pauseButton.setLongClickOptionsEnabled((function() { return [ this._longResumeButton ] }).bind(this));
 
             this._pauseButton.setEnabled(true);
@@ skipping 18 matching lines @@
         this.sidebarPanes.scopechain.update(null);
         this.sidebarPanes.jsBreakpoints.clearBreakpointHighlight();
         WebInspector.domBreakpointsSidebarPane.clearBreakpointHighlight();
         this.sidebarPanes.eventListenerBreakpoints.clearBreakpointHighlight();
         this.sidebarPanes.xhrBreakpoints.clearBreakpointHighlight();
 
         this._clearCurrentExecutionLine();
         this._updateDebuggerButtons();
     },
 
-    /**
-     * @param {!WebInspector.Event} e
-     */
-    _togglePauseOnExceptions: function(e)
+    _togglePauseOnExceptions: function()
     {
-        var target = /** @type {!WebInspector.StatusBarButton} */ (e.target);
-        var state = /** @type {!WebInspector.DebuggerModel.PauseOnExceptionsState} */ (target.state);
-        var toggle = !e.data;
+        var nextStateMap = {};
         var stateEnum = WebInspector.DebuggerModel.PauseOnExceptionsState;
-        if (toggle) {
-            if (state !== stateEnum.DontPauseOnExceptions)
-                state = stateEnum.DontPauseOnExceptions
-            else
-                state = WebInspector.settings.lastPauseOnExceptionState.get();
-        }
-        if (state !== stateEnum.DontPauseOnExceptions)
-            WebInspector.settings.lastPauseOnExceptionState.set(state);
-        WebInspector.settings.pauseOnExceptionStateString.set(state);
+        nextStateMap[stateEnum.DontPauseOnExceptions] = stateEnum.PauseOnAllExceptions;
+        nextStateMap[stateEnum.PauseOnAllExceptions] = stateEnum.PauseOnUncaughtExceptions;
+        nextStateMap[stateEnum.PauseOnUncaughtExceptions] = stateEnum.DontPauseOnExceptions;
+        WebInspector.settings.pauseOnExceptionStateString.set(nextStateMap[this._pauseOnExceptionButton.state]);
     },
 
     /**
      * @return {boolean}
      */
     _runSnippet: function()
     {
         if (this._currentUISourceCode.project().type() !== WebInspector.projectTypes.Snippets)
             return false;
         WebInspector.scriptSnippetModel.evaluateScriptSnippet(this._currentUISourceCode);
@@ skipping 218 matching lines @@
 
         // Toggle Breakpoints
         this._toggleBreakpointsButton = new WebInspector.StatusBarButton(WebInspector.UIString("Deactivate breakpoints."), "scripts-toggle-breakpoints");
         this._toggleBreakpointsButton.toggled = false;
         this._toggleBreakpointsButton.addEventListener("click", this._toggleBreakpointsClicked, this);
         debugToolbar.appendChild(this._toggleBreakpointsButton.element);
 
         // Pause on Exception
         this._pauseOnExceptionButton = new WebInspector.StatusBarButton("", "scripts-pause-on-exceptions-status-bar-item", 3);
         this._pauseOnExceptionButton.addEventListener("click", this._togglePauseOnExceptions, this);
-        this._pauseOnExceptionButton.setLongClickOptionsEnabled(this._createPauseOnExceptionOptions.bind(this));
         debugToolbar.appendChild(this._pauseOnExceptionButton.element);
 
         return debugToolbar;
     },
 
     /**
      * @param {!WebInspector.StatusBarButton} button
      * @param {string} buttonTitle
      */
     _updateButtonTitle: function(button, buttonTitle)
@@ skipping 691 matching lines @@
 WebInspector.DrawerEditorView = function()
 {
     WebInspector.View.call(this);
     this.element.id = "drawer-editor-view";
     this.element.classList.add("vbox");
 }
 
 WebInspector.DrawerEditorView.prototype = {
     __proto__: WebInspector.View.prototype
 }