| 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 261fe058b4f91239f5c0caa4db76c3e9dc6d3cb8..5f1f17d80fd8cbbf46a3aa0ec0a1669596f1f193 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
|
| @@ -24,6 +24,7 @@
|
| namespace {
|
|
|
| // Define the name of the callback functions that will be used by JavaScript.
|
| +const char kInitialize[] = "initializeDeviceEmulator";
|
| const char kBluetoothDiscoverFunction[] = "requestBluetoothDiscover";
|
| const char kBluetoothPairFunction[] = "requestBluetoothPair";
|
| const char kRequestBluetoothInfo[] = "requestBluetoothInfo";
|
| @@ -203,10 +204,8 @@ DeviceEmulatorMessageHandler::DeviceEmulatorMessageHandler()
|
| DeviceEmulatorMessageHandler::~DeviceEmulatorMessageHandler() {
|
| }
|
|
|
| -void DeviceEmulatorMessageHandler::Init() {
|
| - bluetooth_observer_.reset(new BluetoothObserver(this));
|
| - cras_audio_observer_.reset(new CrasAudioObserver(this));
|
| - power_observer_.reset(new PowerObserver(this));
|
| +void DeviceEmulatorMessageHandler::Init(const base::ListValue* args) {
|
| + AllowJavascript();
|
| }
|
|
|
| void DeviceEmulatorMessageHandler::RequestPowerInfo(
|
| @@ -450,6 +449,9 @@ void DeviceEmulatorMessageHandler::UpdatePowerSourceId(
|
|
|
| void DeviceEmulatorMessageHandler::RegisterMessages() {
|
| web_ui()->RegisterMessageCallback(
|
| + kInitialize,
|
| + base::Bind(&DeviceEmulatorMessageHandler::Init, base::Unretained(this)));
|
| + web_ui()->RegisterMessageCallback(
|
| kRequestPowerInfo,
|
| base::Bind(&DeviceEmulatorMessageHandler::RequestPowerInfo,
|
| base::Unretained(this)));
|
| @@ -507,6 +509,18 @@ void DeviceEmulatorMessageHandler::RegisterMessages() {
|
| base::Unretained(this)));
|
| }
|
|
|
| +void DeviceEmulatorMessageHandler::OnJavascriptAllowed() {
|
| + bluetooth_observer_.reset(new BluetoothObserver(this));
|
| + cras_audio_observer_.reset(new CrasAudioObserver(this));
|
| + power_observer_.reset(new PowerObserver(this));
|
| +}
|
| +
|
| +void DeviceEmulatorMessageHandler::OnJavascriptDisallowed() {
|
| + bluetooth_observer_.reset();
|
| + cras_audio_observer_.reset();
|
| + power_observer_.reset();
|
| +}
|
| +
|
| std::string DeviceEmulatorMessageHandler::CreateBluetoothDeviceFromListValue(
|
| const base::ListValue* args) {
|
| const base::DictionaryValue* device_dict = nullptr;
|
|
|