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

Unified Diff: content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc

Issue 1672103002: Pass the frame instead of the WebContents through RunBluetoothChooser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@doc-bubble-lifetimes
Patch Set: Fix Android Created 4 years, 10 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
Index: content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc
diff --git a/content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc b/content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc
index d5a881d602000a52995bddba793df20b64c8e654..fc29b9d86ce3e65175ae3a10aaa10c8091632b7d 100644
--- a/content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc
+++ b/content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc
@@ -6,6 +6,7 @@
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
+#include "content/public/browser/render_frame_host.h"
#include "url/origin.h"
namespace content {
@@ -100,9 +101,9 @@ LayoutTestBluetoothChooserFactory::~LayoutTestBluetoothChooserFactory() {
scoped_ptr<BluetoothChooser>
LayoutTestBluetoothChooserFactory::RunBluetoothChooser(
- WebContents* web_contents,
- const BluetoothChooser::EventHandler& event_handler,
- const url::Origin& origin) {
+ RenderFrameHost* frame,
+ const BluetoothChooser::EventHandler& event_handler) {
+ const url::Origin origin = frame->GetLastCommittedOrigin();
DCHECK(!origin.unique());
std::string event = "chooser-opened(";
event += origin.Serialize();
« no previous file with comments | « content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.h ('k') | content/shell/browser/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698