DevTools: Use TargetsToolbar instead of ThreadToolbar

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 122 matching lines @@
     this._prompt.proxyElement.addEventListener("keydown", this._promptKeyDown.bind(this), false);
     this._prompt.setHistoryData(WebInspector.settings.consoleHistory.get());
     var historyData = WebInspector.settings.consoleHistory.get();
     this._prompt.setHistoryData(historyData);
 
     this._updateFilterStatus();
     WebInspector.settings.consoleTimestampsEnabled.addChangeListener(this._consoleTimestampsSettingChanged, this);
 
     this._registerWithMessageSink();
     WebInspector.targetManager.observeTargets(this);
+    WebInspector.executionContextSelector.addExecutionContextChangeListener(this._executionContextExternallyChanged, this);

[vsevik, 2014/06/18 12:41:32]

Let's make all components use WebInspector.context 

[sergeyv, 2014/06/18 16:50:08]

Done.

 }
 
 WebInspector.ConsoleView.prototype = {
     /**
      * @return {number}
      */
     itemCount: function()
     {
         return this._visibleViewMessages.length;
     },
@@ skipping 158 matching lines @@
         for (var i = 0; i < options.length; ++i) {
             var optionContext = options[i].__executionContext;
             var isSameGroup = executionContext.target() === optionContext.target() && executionContext.frameId === optionContext.frameId;
             sameGroupExists |= isSameGroup;
             if ((isSameGroup && WebInspector.ExecutionContext.comparator(optionContext, executionContext) > 0) || (sameGroupExists && !isSameGroup)) {
                 insertBeforeOption = options[i];
                 break;
             }
         }
         this._executionContextSelector.selectElement().insertBefore(newOption, insertBeforeOption);
+        if (executionContext === WebInspector.executionContextSelector.currentExecutionContext())
+            this._executionContextSelector.select(newOption);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onExecutionContextDestroyed: function(event)
     {
         var executionContext = /** @type {!WebInspector.ExecutionContext} */ (event.data);
         var option = this._optionByExecutionContext.remove(executionContext);
         option.remove();
     },
 
     _executionContextChanged: function()
     {
         var newContext = this._currentExecutionContext();
-        WebInspector.context.setFlavor(WebInspector.ExecutionContext, newContext);
+        WebInspector.executionContextSelector.setCurrentExecutionContext(newContext);
         this._prompt.clearAutoComplete(true);
         if (!this._showAllMessagesCheckbox.checked())
             this._updateMessageList();
     },
 
     /**
+     * @param {?WebInspector.ExecutionContext} executionContext
+     */
+    _executionContextExternallyChanged: function(executionContext)
+    {
+        if (!executionContext)
+            return;
+
+        var options = this._executionContextSelector.selectElement().options;
+        for (var i = 0; i < options.length; ++i) {
+            if (options[i].__executionContext === executionContext)
+                this._executionContextSelector.select(options[i]);
+        }
+    },
+
+    /**
      * @return {?WebInspector.ExecutionContext}
      */
     _currentExecutionContext: function()
     {
         var option = this._executionContextSelector.selectedOption();
         return option ? option.__executionContext : null;
     },
 
     willHide: function()
     {
@@ skipping 448 matching lines @@
     },
 
     /**
      * @param {string} text
      * @param {boolean} useCommandLineAPI
      */
     _appendCommand: function(text, useCommandLineAPI)
     {
 
         this._prompt.text = "";
-        var currentExecutionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
+        var currentExecutionContext = WebInspector.executionContextSelector.currentExecutionContext();
         if (currentExecutionContext)
             WebInspector.ConsoleModel.evaluateCommandInConsole(currentExecutionContext, text, useCommandLineAPI);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _commandEvaluated: function(event)
     {
         var data = /**{{result: ?WebInspector.RemoteObject, wasThrown: boolean, text: string, commandMessage: !WebInspector.ConsoleMessage}} */ (event.data);
@@ skipping 150 matching lines @@
         return this._messageURLFilters;
     },
 
     /**
      * @param {!WebInspector.ConsoleViewMessage} viewMessage
      * @return {boolean}
      */
     shouldBeVisible: function(viewMessage)
     {
         var message = viewMessage.consoleMessage();
-        var executionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
+        var executionContext = WebInspector.executionContextSelector.currentExecutionContext();
         if (!message.target())
             return true;
 
         if (!this._view._showAllMessagesCheckbox.checked() && executionContext && (message.target() !== executionContext.target() || message.executionContextId !== executionContext.id))
             return false;
 
         if (viewMessage.consoleMessage().isGroupMessage())
             return true;
 
         if (message.type === WebInspector.ConsoleMessage.MessageType.Result || message.type === WebInspector.ConsoleMessage.MessageType.Command)
@@ skipping 193 matching lines @@
 WebInspector.ConsoleView.ShowConsoleActionDelegate.prototype = {
     /**
      * @return {boolean}
      */
     handleAction: function()
     {
         WebInspector.console.show();
         return true;
     }
 }