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

Unified Diff: chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc

Issue 1805393002: Added MediaRouterUIBrowserTest::toolbar_action_view_ to a Widget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Proposed solution. Created 4 years, 9 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: chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
diff --git a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
index 5054bc4236175306ff2a616488ae43268add5886..b88e7d25ac5246fc62e14b9b9221ded7b4081e19 100644
--- a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
+++ b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
@@ -21,6 +21,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/test/test_navigation_observer.h"
#include "content/public/test/test_utils.h"
+#include "ui/views/widget/widget.h"
namespace media_router {
@@ -47,6 +48,13 @@ class MediaRouterUIBrowserTest : public InProcessBrowserTest {
toolbar_action_view_.reset(
new ToolbarActionView(media_router_action_.get(),
browser_actions_container));
+
+ toolbar_action_view_widget_.reset(new views::Widget);
+ views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
+ params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+ toolbar_action_view_widget_->Init(params);
+ toolbar_action_view_widget_->Show();
+ toolbar_action_view_widget_->SetContentsView(toolbar_action_view_.get());
}
void TearDownOnMainThread() override {
@@ -92,6 +100,9 @@ class MediaRouterUIBrowserTest : public InProcessBrowserTest {
// ToolbarActionView constructed to set the delegate on |mr_action|.
scoped_ptr<ToolbarActionView> toolbar_action_view_;
Evan Stade 2016/03/17 21:41:35 is this still the right ownership model? I'd expec
bruthig 2016/03/18 15:39:21 Good catch, updated. PTAL
+
+ // Hosts the |toolbar_action_view_|.
+ scoped_ptr<views::Widget> toolbar_action_view_widget_;
Evan Stade 2016/03/17 21:41:35 likewise aren't widgets usually self-owned? You ju
bruthig 2016/03/18 15:39:21 Is this what you are suggesting, using a raw point
};
IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,

Powered by Google App Engine
This is Rietveld 408576698