Merge to 2661 "[DevTools] Show viewport size on resize by default, disable in device mode."

> [DevTools] Show viewport size on resize by default, disable in device mode.
>
> BUG=592847
>
> Review URL: https://codereview.chromium.org/1771853004
>
> Cr-Commit-Position: refs/heads/master@{#380212}

(cherry picked from commit 5e9b5ed287ad4e8a91e7e99e6b426a2ae9897f5a)
TBR=pfeldman

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

Cr-Commit-Position: refs/branch-heads/2661@{#241}
Cr-Branched-From: ef6f6ae5e4c96622286b563658d5cd62a6cf1197-refs/heads/master@{#378081}

3 files changed, 3 insertions, 1 deletions

diff --git a/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeModel.js b/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeModel.js
index 159c002..f1bf6c6 100644
--- a/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeModel.js
@@ -442,6 +442,8 @@ WebInspector.DeviceModeModel.prototype = {
             this._applyUserAgent(mobile ? WebInspector.DeviceModeModel._defaultMobileUserAgent : "");
         }
         this._reapplyTouch();
+        if (this._target)
+            this._target.renderingAgent().setShowViewportSizeOnResize(this._type === WebInspector.DeviceModeModel.Type.None);
         this._updateCallback.call(null);
     },
 
diff --git a/third_party/WebKit/Source/devtools/front_end/main/Main.js b/third_party/WebKit/Source/devtools/front_end/main/Main.js
index e43bf11..5f48468 100644
--- a/third_party/WebKit/Source/devtools/front_end/main/Main.js
+++ b/third_party/WebKit/Source/devtools/front_end/main/Main.js
@@ -1108,6 +1108,7 @@ WebInspector.BackendSettingsSync.prototype = {
     {
         target.pageAgent().setAutoAttachToCreatedPages(this._autoAttachSetting.get());
         target.emulationAgent().setScriptExecutionDisabled(this._disableJavascriptSetting.get());
+        target.renderingAgent().setShowViewportSizeOnResize(true);
     },
 
     /**
diff --git a/third_party/WebKit/Source/devtools/front_end/main/RenderingOptions.js b/third_party/WebKit/Source/devtools/front_end/main/RenderingOptions.js
index 60ac91c..571d51a 100644
--- a/third_party/WebKit/Source/devtools/front_end/main/RenderingOptions.js
+++ b/third_party/WebKit/Source/devtools/front_end/main/RenderingOptions.js
@@ -46,7 +46,6 @@ WebInspector.RenderingOptionsView = function()
     this._appendCheckbox(WebInspector.UIString("Show FPS meter"), "setShowFPSCounter");
     var scrollingTitle = WebInspector.UIString("Shows areas of the page that slow down scrolling:\nTouch and mousewheel event listeners can delay scrolling.\nSome areas need to repaint their content when scrolled.");
     this._appendCheckbox(WebInspector.UIString("Show scrolling perf issues"), "setShowScrollBottleneckRects", scrollingTitle);
-    this._appendCheckbox(WebInspector.UIString("Show page size on resize"), "setShowViewportSizeOnResize");
 
     // CSS media.
     var mediaRow = this.contentElement.createChild("div", "media-row");