chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 2006083002: Use fake Input Device Settings with chrome://device-emulator

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: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 2006083002: Use fake Input Device Settings with chrome://device-emulator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DevicePageTestsFixes

Patch Set: cleanup Created 4 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

« chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc ('K') | « chrome/browser/resources/chromeos/emulator/input_device_settings.js ('k') | chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h » ('j') | chrome/chrome_browser_chromeos.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

index 1c2ad86521fa48a5ac0ba822bce8572bb7e82050..97bc2270e1db677db1fc15eb4e7ecf7ef557bfc8 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -146,7 +146,7 @@

#include "components/proximity_auth/webui/url_constants.h"

#endif

-#if !defined(OFFICIAL_BUILD) && defined(OS_CHROMEOS) && !defined(NDEBUG)

+#if defined(OS_CHROMEOS) && !defined(NDEBUG)

#include "chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h"

#endif

@@ -497,12 +497,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

return &NewWebUI<chromeos::SlowTraceController>;

if (url.host() == chrome::kChromeUIVoiceSearchHost)

return &NewWebUI<VoiceSearchUI>;

-#if !defined(GOOGLE_CHROME_BUILD) && !defined(NDEBUG)

+#if !defined(NDEBUG)

if (!base::SysInfo::IsRunningOnChromeOS()) {

if (url.host() == chrome::kChromeUIDeviceEmulatorHost)

return &NewWebUI<DeviceEmulatorUI>;

}

-#endif // !defined(GOOGLE_CHROME_BUILD) && !defined(NDEBUG)

+#endif // !defined(NDEBUG)

#endif // defined(OS_CHROMEOS)

#if defined(OS_ANDROID)

if (url.host() == chrome::kChromeUINetExportHost)