[DevTools] Fix responsive design UI issues.

BUG=327641

Review URL: https://codereview.chromium.org/306123005

git-svn-id: svn://svn.chromium.org/blink/trunk@175195 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/devtools/front_end/ResponsiveDesignView.js

@@ -58,7 +58,7 @@ WebInspector.ResponsiveDesignView = function(inspectedPagePlaceholder)
 // Measured in DIP.
 WebInspector.ResponsiveDesignView.SliderWidth = 19;
 WebInspector.ResponsiveDesignView.RulerWidth = 20;
-WebInspector.ResponsiveDesignView.ToolbarHeight = 24;
+WebInspector.ResponsiveDesignView.ToolbarHeight = 23;
 
 WebInspector.ResponsiveDesignView.prototype = {
     _maybeEnableResponsiveDesign: function()
@@ -74,11 +74,6 @@ WebInspector.ResponsiveDesignView.prototype = {
 
     _responsiveDesignModeChanged: function()
     {
-        if (WebInspector.dockController.dockSide() === WebInspector.DockController.State.Undocked) {
-            WebInspector.overridesSupport.setPageResizer(null);
-            return;
-        }
-
         delete this._cachedScale;
         delete this._cachedCssCanvasWidth;
         delete this._cachedCssCanvasHeight;
@@ -87,7 +82,7 @@ WebInspector.ResponsiveDesignView.prototype = {
         delete this._cachedZoomFactor;
         delete this._availableSize;
 
-        var enabled = WebInspector.settings.responsiveDesignMode.get();
+        var enabled = WebInspector.settings.responsiveDesignMode.get() && WebInspector.dockController.dockSide() !== WebInspector.DockController.State.Undocked;
         if (enabled && !this._enabled) {
             this._ignoreResize = true;
             this._enabled = true;

third_party/WebKit/Source/devtools/front_end/sdk/OverridesSupport.js

@@ -508,7 +508,8 @@ WebInspector.OverridesSupport.prototype = {
             return;
         var userAgent = this.settings.overrideUserAgent.get() ? this.settings.userAgent.get() : "";
         NetworkAgent.setUserAgentOverride(userAgent);
-        this._updateUserAgentWarningMessage(this._userAgent !== userAgent ? WebInspector.UIString("You might need to reload the page for proper user agent spoofing and viewport rendering.") : "");
+        if (this._userAgent !== userAgent)
+            this._updateUserAgentWarningMessage(WebInspector.UIString("You might need to reload the page for proper user agent spoofing and viewport rendering."));
         this._userAgent = userAgent;
         this.maybeHasActiveOverridesChanged();
     },
@@ -610,8 +611,8 @@ WebInspector.OverridesSupport.prototype = {
 
             var overrideDeviceResolution = this.settings.overrideDeviceResolution.get();
             var viewportEnabled = this.settings.emulateViewport.get();
-            this._updateDeviceMetricsWarningMessage(this._overrideDeviceResolution !== overrideDeviceResolution || this._emulateViewportEnabled != viewportEnabled ?
-                WebInspector.UIString("You might need to reload the page for proper user agent spoofing and viewport rendering.") : "");
+            if (this._overrideDeviceResolution !== overrideDeviceResolution || this._emulateViewportEnabled !== viewportEnabled)
+                this._updateDeviceMetricsWarningMessage(WebInspector.UIString("You might need to reload the page for proper user agent spoofing and viewport rendering."));
             this._overrideDeviceResolution = overrideDeviceResolution;
             this._emulateViewportEnabled = viewportEnabled;
             this._deviceMetricsOverrideAppliedForTest();
@@ -716,6 +717,7 @@ WebInspector.OverridesSupport.prototype = {
     {
         this._deviceMetricsChanged();
         this._updateUserAgentWarningMessage("");
+        this._updateDeviceMetricsWarningMessage("");
     },
 
     /**