third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeToolbar.js - Issue 1975563002: [DevTools] Move device outline out of experiment.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeToolbar.js

Issue 1975563002: [DevTools] Move device outline out of experiment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@device-outline-fixes

Patch Set: Created 4 years, 7 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 | « third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeModel.js ('k') | third_party/WebKit/Source/devtools/front_end/main/Main.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeToolbar.js

diff --git a/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeToolbar.js b/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeToolbar.js

index 20064df5a482658d732b7003dc34fb80cd5dad88..472cd283de53173b1f2b37f2d2479cb331a0cf13 100644

--- a/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeToolbar.js

+++ b/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeToolbar.js

@@ -267,8 +267,7 @@ WebInspector.DeviceModeToolbar.prototype = {

_appendOptionsMenuItems: function(contextMenu)

{

var submenu = contextMenu.appendSubMenuItem(WebInspector.UIString("Show"));

- if (Runtime.experiments.isEnabled("deviceFrames"))

- submenu.appendCheckboxItem(WebInspector.UIString("Device frame"), this._toggleDeviceFrames.bind(this), this._deviceOutlineSetting.get(), this._model.type() !== WebInspector.DeviceModeModel.Type.Device);

+ submenu.appendCheckboxItem(WebInspector.UIString("Device frame"), this._toggleDeviceOutline.bind(this), this._deviceOutlineSetting.get(), this._model.type() !== WebInspector.DeviceModeModel.Type.Device);

submenu.appendCheckboxItem(WebInspector.UIString("Device pixel ratio"), this._toggleDeviceScaleFactor.bind(this), this._showDeviceScaleFactorSetting.get(), this._model.type() === WebInspector.DeviceModeModel.Type.None);

submenu.appendCheckboxItem(WebInspector.UIString("Device type"), this._toggleUserAgentType.bind(this), this._showUserAgentTypeSetting.get(), this._model.type() === WebInspector.DeviceModeModel.Type.None);

submenu.appendCheckboxItem(WebInspector.UIString("Network throttling"), this._toggleNetworkConditions.bind(this), this._showNetworkConditionsSetting.get(), this._model.type() === WebInspector.DeviceModeModel.Type.None);

@@ -285,7 +284,7 @@ WebInspector.DeviceModeToolbar.prototype = {

this._showDeviceScaleFactorSetting.set(!this._showDeviceScaleFactorSetting.get());

- _toggleDeviceFrames: function()

+ _toggleDeviceOutline: function()

{

this._deviceOutlineSetting.set(!this._deviceOutlineSetting.get());