| Index: chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
|
| index 9a7accd1c491a73a2cb378fb4848569b056c4f7a..07ab29251d853741af7eed6129ca9a269699d1a6 100644
|
| --- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
|
| @@ -8,7 +8,7 @@
|
| #include <utility>
|
|
|
| #include "ash/common/system/tray/system_tray_delegate.h"
|
| -#include "ash/shell.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "base/bind.h"
|
| #include "base/macros.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -279,7 +279,7 @@ void DeviceEmulatorMessageHandler::HandleRequestBluetoothPair(
|
|
|
| // Try to pair the device with the main adapter. The device is identified
|
| // by its device ID, which, in this case is the same as its address.
|
| - ash::Shell::GetInstance()->system_tray_delegate()->ConnectToBluetoothDevice(
|
| + ash::WmShell::Get()->system_tray_delegate()->ConnectToBluetoothDevice(
|
| props->address.value());
|
| if (!props->paired.value()) {
|
| web_ui()->CallJavascriptFunctionUnsafe(kPairFailedJSCallback,
|
|
|