Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1189)

Unified Diff: Source/devtools/front_end/sdk/OverridesSupport.js

Issue 298913004: [DevTools] Add Toolbox page to undocked DevTools frontend. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Changed DockSide events Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/front_end/main/Main.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/sdk/OverridesSupport.js
diff --git a/Source/devtools/front_end/sdk/OverridesSupport.js b/Source/devtools/front_end/sdk/OverridesSupport.js
index 597d521fa246c96404d376562fe6e4a3d36f879a..2dc25ab27b9f32f63d6c421b7dec213475a5e01f 100644
--- a/Source/devtools/front_end/sdk/OverridesSupport.js
+++ b/Source/devtools/front_end/sdk/OverridesSupport.js
@@ -41,6 +41,7 @@ WebInspector.OverridesSupport = function(responsiveDesignAvailable)
this._emulateViewportEnabled = false;
this._userAgent = "";
this._pageResizer = null;
+ this._initialized = false;
WebInspector.targetManager.observeTargets(this);
this._responsiveDesignAvailable = responsiveDesignAvailable;
}
@@ -426,7 +427,8 @@ WebInspector.OverridesSupport.prototype = {
this._pageResizer.addEventListener(WebInspector.OverridesSupport.PageResizer.Events.AvailableSizeChanged, this._onPageResizerAvailableSizeChanged, this);
this._pageResizer.addEventListener(WebInspector.OverridesSupport.PageResizer.Events.ResizeRequested, this._onPageResizerResizeRequested, this);
}
- this._deviceMetricsChanged();
+ if (this._initialized)
+ this._deviceMetricsChanged();
},
/**
@@ -449,8 +451,11 @@ WebInspector.OverridesSupport.prototype = {
this.settings.emulateViewport.set(true);
delete this._deviceMetricsChangedListenerMuted;
delete this._userAgentChangedListenerMuted;
- this._deviceMetricsChanged();
- this._userAgentChanged();
+
+ if (this._initialized) {
+ this._deviceMetricsChanged();
+ this._userAgentChanged();
+ }
},
resetEmulatedDevice: function()
@@ -463,8 +468,11 @@ WebInspector.OverridesSupport.prototype = {
this.settings.emulateViewport.set(false);
delete this._deviceMetricsChangedListenerMuted;
delete this._userAgentChangedListenerMuted;
- this._deviceMetricsChanged();
- this._userAgentChanged();
+
+ if (this._initialized) {
+ this._deviceMetricsChanged();
+ this._userAgentChanged();
+ }
},
reset: function()
@@ -482,6 +490,33 @@ WebInspector.OverridesSupport.prototype = {
return;
}
+ this._initialized = true;
+
+ this.settings.overrideUserAgent.addChangeListener(this._userAgentChanged, this);
+ this.settings.userAgent.addChangeListener(this._userAgentChanged, this);
+
+ this.settings.overrideDeviceResolution.addChangeListener(this._deviceMetricsChanged, this);
+ this.settings.deviceWidth.addChangeListener(this._deviceMetricsChanged, this);
+ this.settings.deviceHeight.addChangeListener(this._deviceMetricsChanged, this);
+ this.settings.deviceScaleFactor.addChangeListener(this._deviceMetricsChanged, this);
+ this.settings.deviceTextAutosizing.addChangeListener(this._deviceMetricsChanged, this);
+ this.settings.emulateViewport.addChangeListener(this._deviceMetricsChanged, this);
+ this.settings.deviceFitWindow.addChangeListener(this._deviceMetricsChanged, this);
+ WebInspector.settings.responsiveDesignMode.addChangeListener(this._deviceMetricsChanged, this);
+
+ this.settings.overrideGeolocation.addChangeListener(this._geolocationPositionChanged, this);
+ this.settings.geolocationOverride.addChangeListener(this._geolocationPositionChanged, this);
+
+ this.settings.overrideDeviceOrientation.addChangeListener(this._deviceOrientationChanged, this);
+ this.settings.deviceOrientationOverride.addChangeListener(this._deviceOrientationChanged, this);
+
+ this.settings.emulateTouchEvents.addChangeListener(this._emulateTouchEventsChanged, this);
+
+ this.settings.overrideCSSMedia.addChangeListener(this._cssMediaChanged, this);
+ this.settings.emulatedCSSMedia.addChangeListener(this._cssMediaChanged, this);
+
+ WebInspector.settings.showMetricsRulers.addChangeListener(this._showRulersChanged, this);
+
if (this.settings.overrideDeviceOrientation.get())
this._deviceOrientationChanged();
@@ -517,7 +552,8 @@ WebInspector.OverridesSupport.prototype = {
_onPageResizerAvailableSizeChanged: function()
{
- this._deviceMetricsChanged();
+ if (this._initialized)
+ this._deviceMetricsChanged();
},
_onPageResizerResizeRequested: function(event)
@@ -535,11 +571,12 @@ WebInspector.OverridesSupport.prototype = {
if (this._deviceMetricsChangedListenerMuted)
return;
- var responsiveDesignAvailableAndDisabled = this._responsiveDesignAvailable && !WebInspector.settings.responsiveDesignMode.get();
+ var responsiveDesignAvailableAndDisabled = this._responsiveDesignAvailable && (!WebInspector.settings.responsiveDesignMode.get() || !this._pageResizer);
var overrideDeviceResolution = this.settings.overrideDeviceResolution.get();
- if (responsiveDesignAvailableAndDisabled || (!overrideDeviceResolution && !this.settings.emulateViewport.get())) {
+ var emulationEnabled = overrideDeviceResolution || this.settings.emulateViewport.get();
+ if (responsiveDesignAvailableAndDisabled || !emulationEnabled) {
PageAgent.clearDeviceMetricsOverride(apiCallback.bind(this));
- if (this._pageResizer)
+ if (this._pageResizer && !emulationEnabled)
this._pageResizer.update(0, 0, 0);
this.maybeHasActiveOverridesChanged();
return;
@@ -716,7 +753,8 @@ WebInspector.OverridesSupport.prototype = {
_onMainFrameNavigated: function()
{
- this._deviceMetricsChanged();
+ if (this._initialized)
+ this._deviceMetricsChanged();
this._updateUserAgentWarningMessage("");
this._updateDeviceMetricsWarningMessage("");
},
@@ -780,30 +818,6 @@ WebInspector.OverridesSupport.prototype = {
this.maybeHasActiveOverridesChanged();
- this.settings.overrideUserAgent.addChangeListener(this._userAgentChanged, this);
- this.settings.userAgent.addChangeListener(this._userAgentChanged, this);
-
- this.settings.overrideDeviceResolution.addChangeListener(this._deviceMetricsChanged, this);
- this.settings.deviceWidth.addChangeListener(this._deviceMetricsChanged, this);
- this.settings.deviceHeight.addChangeListener(this._deviceMetricsChanged, this);
- this.settings.deviceScaleFactor.addChangeListener(this._deviceMetricsChanged, this);
- this.settings.deviceTextAutosizing.addChangeListener(this._deviceMetricsChanged, this);
- this.settings.emulateViewport.addChangeListener(this._deviceMetricsChanged, this);
- this.settings.deviceFitWindow.addChangeListener(this._deviceMetricsChanged, this);
-
- this.settings.overrideGeolocation.addChangeListener(this._geolocationPositionChanged, this);
- this.settings.geolocationOverride.addChangeListener(this._geolocationPositionChanged, this);
-
- this.settings.overrideDeviceOrientation.addChangeListener(this._deviceOrientationChanged, this);
- this.settings.deviceOrientationOverride.addChangeListener(this._deviceOrientationChanged, this);
-
- this.settings.emulateTouchEvents.addChangeListener(this._emulateTouchEventsChanged, this);
-
- this.settings.overrideCSSMedia.addChangeListener(this._cssMediaChanged, this);
- this.settings.emulatedCSSMedia.addChangeListener(this._cssMediaChanged, this);
-
- WebInspector.settings.showMetricsRulers.addChangeListener(this._showRulersChanged, this);
-
if (this._applyInitialOverridesOnTargetAdded) {
delete this._applyInitialOverridesOnTargetAdded;
this.applyInitialOverrides();
« no previous file with comments | « Source/devtools/front_end/main/Main.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698