DevTools: move UI components to target observers in preparation to early UI initialization.

Source/devtools/front_end/sdk/OverridesSupport.js

 /*
  * Copyright (C) 2012 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
  */
 
 /**
  * @constructor
  * @implements {WebInspector.TargetManager.Observer}
  * @extends {WebInspector.Object}
  * @param {boolean} responsiveDesignAvailable
  */
 WebInspector.OverridesSupport = function(responsiveDesignAvailable)
 {
-    WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._onMainFrameNavigated.bind(this), this);
     this._touchEmulationSuspended = false;
     this._emulateMobileEnabled = false;
     this._userAgent = "";
     this._pageResizer = null;
     this._deviceScale = 1;
     this._fixedDeviceScale = false;
     this._initialized = false;
     this._deviceMetricsThrottler = new WebInspector.Throttler(0);
     this._responsiveDesignAvailable = responsiveDesignAvailable;
+
+    this.settings = {};
+    this.settings._emulationEnabled = WebInspector.settings.createSetting("emulationEnabled", false);
+
+    this.settings.userAgent = WebInspector.settings.createSetting("userAgent", "");
+
+    this.settings.emulateResolution = WebInspector.settings.createSetting("emulateResolution", true);
+    this.settings.deviceWidth = WebInspector.settings.createSetting("deviceWidth", 360);
+    this.settings.deviceHeight = WebInspector.settings.createSetting("deviceHeight", 640);
+    this.settings.deviceScaleFactor = WebInspector.settings.createSetting("deviceScaleFactor", 0);
+    this.settings.deviceFitWindow = WebInspector.settings.createSetting("deviceFitWindow", true);
+    this.settings.emulateMobile = WebInspector.settings.createSetting("emulateMobile", false);
+    this.settings.customDevicePresets = WebInspector.settings.createSetting("customDevicePresets", []);
+
+    this.settings.emulateTouch = WebInspector.settings.createSetting("emulateTouch", false);
+
+    this.settings.overrideGeolocation = WebInspector.settings.createSetting("overrideGeolocation", false);
+    this.settings.geolocationOverride = WebInspector.settings.createSetting("geolocationOverride", "");
+
+    this.settings.overrideDeviceOrientation = WebInspector.settings.createSetting("overrideDeviceOrientation", false);
+    this.settings.deviceOrientationOverride = WebInspector.settings.createSetting("deviceOrientationOverride", "");
+
+    this.settings.overrideCSSMedia = WebInspector.settings.createSetting("overrideCSSMedia", false);
+    this.settings.emulatedCSSMedia = WebInspector.settings.createSetting("emulatedCSSMedia", "print");
+
+    this.settings.networkConditions = WebInspector.settings.createSetting("networkConditions", {throughput: WebInspector.OverridesSupport.NetworkThroughputUnlimitedValue, latency: 0});
+
     WebInspector.targetManager.observeTargets(this);
 }
 
 WebInspector.OverridesSupport.Events = {
     OverridesWarningUpdated: "OverridesWarningUpdated",
     EmulationStateChanged: "EmulationStateChanged"
 }
 
 WebInspector.OverridesSupport.MaxDeviceSize = 3000;
 
@@ skipping 684 matching lines @@
 
     /**
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         // FIXME: adapt this to multiple targets.
         if (this._target)
             return;
         this._target = target;
-
-        this.settings = {};
-        this.settings._emulationEnabled = WebInspector.settings.createSetting("emulationEnabled", false);
-
-        this.settings.userAgent = WebInspector.settings.createSetting("userAgent", "");
-
-        this.settings.emulateResolution = WebInspector.settings.createSetting("emulateResolution", true);
-        this.settings.deviceWidth = WebInspector.settings.createSetting("deviceWidth", 360);
-        this.settings.deviceHeight = WebInspector.settings.createSetting("deviceHeight", 640);
-        this.settings.deviceScaleFactor = WebInspector.settings.createSetting("deviceScaleFactor", 0);
-        this.settings.deviceFitWindow = WebInspector.settings.createSetting("deviceFitWindow", true);
-        this.settings.emulateMobile = WebInspector.settings.createSetting("emulateMobile", false);
-        this.settings.customDevicePresets = WebInspector.settings.createSetting("customDevicePresets", []);
-
-        this.settings.emulateTouch = WebInspector.settings.createSetting("emulateTouch", false);
-
-        this.settings.overrideGeolocation = WebInspector.settings.createSetting("overrideGeolocation", false);
-        this.settings.geolocationOverride = WebInspector.settings.createSetting("geolocationOverride", "");
-
-        this.settings.overrideDeviceOrientation = WebInspector.settings.createSetting("overrideDeviceOrientation", false);
-        this.settings.deviceOrientationOverride = WebInspector.settings.createSetting("deviceOrientationOverride", "");
-
-        this.settings.overrideCSSMedia = WebInspector.settings.createSetting("overrideCSSMedia", false);
-        this.settings.emulatedCSSMedia = WebInspector.settings.createSetting("emulatedCSSMedia", "print");
-
-        this.settings.networkConditions = WebInspector.settings.createSetting("networkConditions", {throughput: WebInspector.OverridesSupport.NetworkThroughputUnlimitedValue, latency: 0});
+        target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._onMainFrameNavigated, this);
 
         if (this._applyInitialOverridesOnTargetAdded) {
             delete this._applyInitialOverridesOnTargetAdded;
             this.applyInitialOverrides();
         }
     },
 
     swapDimensions: function()
     {
         var width = WebInspector.overridesSupport.settings.deviceWidth.get();
         var height = WebInspector.overridesSupport.settings.deviceHeight.get();
         WebInspector.overridesSupport.settings.deviceWidth.set(height);
         WebInspector.overridesSupport.settings.deviceHeight.set(width);
     },
 
     /**
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
         // FIXME: adapt this to multiple targets.
+        if (target === this._target)
+            target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._onMainFrameNavigated, this);
     },
 
     /**
      * @return {boolean}
      */
     hasTouchInputs: function()
     {
         return !!this._target && this._target.hasTouchInputs;
     },
 
@@ skipping 12 matching lines @@
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 
 /**
  * @type {!WebInspector.OverridesSupport}
  */
 WebInspector.overridesSupport;