| 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 f6d062fdd1cf2b249d880faeb4cc74caf0d2b7cf..0a21c88622f4f75ec25de7ae6c105a4b1244b2d8 100644
|
| --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
| +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
| @@ -114,11 +114,13 @@
|
| #endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| +#include "base/sys_info.h"
|
| #include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h"
|
| #include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h"
|
| #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"
|
| #include "chrome/browser/ui/webui/chromeos/cryptohome_ui.h"
|
| #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h"
|
| +#include "chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h"
|
| #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
|
| #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h"
|
| #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
|
| @@ -437,6 +439,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
| return &NewWebUI<chromeos::ChooseMobileNetworkUI>;
|
| if (url.host() == chrome::kChromeUICryptohomeHost)
|
| return &NewWebUI<chromeos::CryptohomeUI>;
|
| + if (!base::SysInfo::IsRunningOnChromeOS()) {
|
| + if (url.host() == chrome::kChromeUIDeviceEmulatorHost)
|
| + return &NewWebUI<DeviceEmulatorUI>;
|
| + }
|
| if (url.host() == chrome::kChromeUIDriveInternalsHost)
|
| return &NewWebUI<chromeos::DriveInternalsUI>;
|
| if (url.host() == chrome::kChromeUIImageBurnerHost)
|
|
|