Fix devtools js merge errors.

Source/devtools/front_end/console/ConsoleView.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * 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.
@@ skipping 267 matching lines @@
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         this._viewport.invalidate();
         if (WebInspector.targetManager.targets().length > 1 && WebInspector.targetManager.mainTarget().isPage())
             this._showAllMessagesCheckbox.element.classList.toggle("hidden", false);
 
-
         // Start Dart specific code.
-        target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
-target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerResumed, this._debuggerResumed, this);
+        var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
+        debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
+        debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerResumed, this._debuggerResumed, this);
         // End Dart specific code.
 
 
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
 
 
         // Begin Dart specific code.
-        target.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
-        target.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerResumed, this._debuggerResumed, this);
+        var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
+        debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
+        debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerResumed, this._debuggerResumed, this);
         // End Dart specific code.
 
 
     },
 
     _registerWithMessageSink: function()
     {
         WebInspector.console.messages().forEach(this._addSinkMessage, this);
         WebInspector.console.addEventListener(WebInspector.Console.Events.MessageAdded, messageAdded, this);
 
@@ skipping 41 matching lines @@
 
     /**
      * @override
      * @return {!Element}
      */
     defaultFocusedElement: function()
     {
         return this._promptElement;
     },
 
+// START DART SPECIFIC CODE
+    /**
+     * @param {!WebInspector.Event} event
+     */
+    _debuggerPaused: function(event)
+    {
+        this._isPaused = true;
+        this._evaluateOnStackContainer.classList.remove("hidden");
+        this._updateExecutionContextSelectorState();
+    },
+
+    /**
+     * @param {!WebInspector.Event} event
+     */
+    _debuggerResumed: function(event)
+    {
+        this._isPaused = false;
+        this._evaluateOnStackContainer.classList.add("hidden");
+        this._updateExecutionContextSelectorState();
+    },
+
+    _onEvaluateOnStackClick: function(event)
+    {
+        var target = WebInspector.context.flavor(WebInspector.Target);
+        var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
+
+        debuggerModel.setEvaluateOnCallFrameMode(this._evaluateOnStackCheckBox.checked);
+        this._updateExecutionContextSelectorState();
+    },
+
+    _updateExecutionContextSelectorState: function()
+    {
+        this._executionContextSelector.setEnabled(!this._isPaused || !this._evaluateOnStackCheckBox.checked);
+    },
+// END DART SPECIFIC CODE
+
     _executionContextChanged: function()
     {
         this._prompt.clearAutoComplete(true);
         if (!this._showAllMessagesCheckbox.checked())
             this._updateMessageList();
     },
 
     willHide: function()
     {
         this._hidePromptSuggestBox();
@@ skipping 968 matching lines @@
     handleAction: function(context, actionId)
     {
         WebInspector.console.show();
     }
 }
 
 /**
 * @typedef {{messageIndex: number, matchIndex: number}}
 */
 WebInspector.ConsoleView.RegexMatchRange;