Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/network/NetworkConfigView.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkConfigView.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkConfigView.js |
| index ba8ae54c2da314b2ed33d4272cd45e6245b9bf31..f44e10d7c772f2648da2b00dac528c31db74c544 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/network/NetworkConfigView.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkConfigView.js |
| @@ -98,11 +98,16 @@ WebInspector.NetworkConfigView.createUserAgentSelectAndInput = function() |
| userAgentSelectElement.appendChild(new Option(customOverride.title, customOverride.value)); |
| var groups = WebInspector.NetworkConfigView._userAgentGroups; |
| - for (var userAgentDescriptor of WebInspector.NetworkConfigView._userAgentGroups) { |
| + for (var userAgentDescriptor of groups) { |
| var groupElement = userAgentSelectElement.createChild("optgroup"); |
| groupElement.label = userAgentDescriptor.title; |
| - for (var userAgentVersion of userAgentDescriptor.values) |
| - groupElement.appendChild(new Option(userAgentVersion.title, userAgentVersion.value)); |
| + for (var userAgentVersion of userAgentDescriptor.values) { |
| + var userAgentValue = userAgentVersion.value; |
| + |
| + if (userAgentDescriptor.title === "Chrome") |
| + userAgentValue = WebInspector.BrowserVersionInfo.patchUserAgentWithChromeVersion(userAgentValue); |
|
pfeldman
2016/09/14 21:47:10
You can unconditionally do that.
luoe
2016/09/14 22:49:13
Done.
|
| + groupElement.appendChild(new Option(userAgentVersion.title, userAgentValue)); |
| + } |
| } |
| userAgentSelectElement.selectedIndex = 0; |
| @@ -159,7 +164,6 @@ WebInspector.NetworkConfigView.createUserAgentSelectAndInput = function() |
| return { select: userAgentSelectElement, input: otherUserAgentElement }; |
| } |
| - |
| /** @type {!Array.<{title: string, values: !Array.<{title: string, value: string}>}>} */ |
| WebInspector.NetworkConfigView._userAgentGroups = [ |
| { |
| @@ -180,12 +184,12 @@ WebInspector.NetworkConfigView._userAgentGroups = [ |
| { |
| title: "Chrome", |
| values: [ |
| - {title: "Chrome 52 \u2014 Android Mobile", value: "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2725.0 Mobile Safari/537.36"}, |
| - {title: "Chrome 52 \u2014 Android Tablet", value: "Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2725.0 Safari/537.36"}, |
| - {title: "Chrome 52 \u2014 iPhone", value: "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/52.0.2725.0 Mobile/13B143 Safari/601.1.46"}, |
| - {title: "Chrome 52 \u2014 iPad", value: "Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/52.0.2725.0 Mobile/13B143 Safari/601.1.46"}, |
| - {title: "Chrome 52 \u2014 Mac", value: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2725.0 Safari/537.36"}, |
| - {title: "Chrome 52 \u2014 Windows", value: "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2725.0 Safari/537.36"} |
| + {title: "Chrome \u2014 Android Mobile", value: "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36"}, |
| + {title: "Chrome \u2014 Android Tablet", value: "Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36"}, |
| + {title: "Chrome \u2014 iPhone", value: "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/%s Mobile/13B143 Safari/601.1.46"}, |
| + {title: "Chrome \u2014 iPad", value: "Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/%s Mobile/13B143 Safari/601.1.46"}, |
| + {title: "Chrome \u2014 Mac", value: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36"}, |
| + {title: "Chrome \u2014 Windows", value: "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36"} |
| ] |
| }, |
| { |