| Index: chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h
|
| diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h b/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h
|
| index 1b693d450cae42c7c44de68841051c7342b23041..8da7e3bd7800fefce1f8b8986a468f7e48059877 100644
|
| --- a/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h
|
| +++ b/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h
|
| @@ -5,12 +5,8 @@
|
| #ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_PAIRING_DIALOG_H_
|
| #define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_PAIRING_DIALOG_H_
|
|
|
| -#include <string>
|
| -
|
| -#include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/values.h"
|
| -#include "ui/gfx/native_widget_types.h"
|
| #include "ui/web_dialogs/web_dialog_delegate.h"
|
|
|
| namespace device {
|
| @@ -19,14 +15,15 @@ class BluetoothDevice;
|
|
|
| namespace chromeos {
|
|
|
| -// Bluetooth device pairing dialog shown form ash tray bubble.
|
| +// Bluetooth device pairing dialog shown from ash tray bubble.
|
| class BluetoothPairingDialog : public ui::WebDialogDelegate {
|
| public:
|
| - BluetoothPairingDialog(gfx::NativeWindow parent_window,
|
| - const device::BluetoothDevice* device);
|
| + explicit BluetoothPairingDialog(const device::BluetoothDevice* device);
|
| ~BluetoothPairingDialog() override;
|
|
|
| - void Show();
|
| + // Shows the dialog in an ash window container (which must be a system modal
|
| + // container) on the primary display. See ash/public/cpp/shell_window_ids.h.
|
| + void ShowInContainer(int container_id);
|
|
|
| content::WebUI* GetWebUIForTest() { return webui_; }
|
|
|
| @@ -49,7 +46,6 @@ class BluetoothPairingDialog : public ui::WebDialogDelegate {
|
| bool HandleContextMenu(const content::ContextMenuParams& params) override;
|
|
|
| private:
|
| - gfx::NativeWindow parent_window_;
|
| base::DictionaryValue device_data_;
|
| content::WebUI* webui_;
|
|
|
|
|