Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4029)

Unified Diff: chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h

Issue 2446403003: chromeos: Convert bluetooth pairing dialog to work with mash, part 1 (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h
diff --git a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h
index 093f426cec106111ce104420b2d107bc62d0a0e1..40c8643ba5ba836d5f9e2853899f325def40f7d3 100644
--- a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h
+++ b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h
@@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/public/cpp/shell_window_ids.h"
#include "base/auto_reset.h"
#include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
#include "chrome/test/base/web_ui_browser_test.h"
#include "content/public/browser/web_ui.h"
#include "content/public/test/browser_test_utils.h"
@@ -58,9 +57,8 @@ void BluetoothPairingUITest::ShowDialog() {
.WillOnce(testing::Return(mock_device_.get()));
chromeos::BluetoothPairingDialog* dialog =
- new chromeos::BluetoothPairingDialog(
- browser()->window()->GetNativeWindow(), mock_device_.get());
- dialog->Show();
+ new chromeos::BluetoothPairingDialog(mock_device_.get());
+ dialog->ShowInContainer(ash::kShellWindowId_SystemModalContainer);
content::WebUI* webui = dialog->GetWebUIForTest();
content::WebContents* webui_webcontents = webui->GetWebContents();
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698