ui/views/cocoa/bridged_native_widget_unittest.mm - Issue 654393002: MacViews: Fix WidgetTest.DesktopNativeWidgetNoPaintAfterCloseTest

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/cocoa/bridged_native_widget_unittest.mm

Issue 654393002: MacViews: Fix WidgetTest.DesktopNativeWidgetNoPaintAfterCloseTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more consistent Created 6 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

Index: ui/views/cocoa/bridged_native_widget_unittest.mm

diff --git a/ui/views/cocoa/bridged_native_widget_unittest.mm b/ui/views/cocoa/bridged_native_widget_unittest.mm

index bd7233139a42c9d04febaa4b8e0114998e48e584..fb4c679fb3114fcbc2c8ffb9e0dc958cf827900b 100644

--- a/ui/views/cocoa/bridged_native_widget_unittest.mm

+++ b/ui/views/cocoa/bridged_native_widget_unittest.mm

@@ -20,6 +20,7 @@

#include "ui/views/ime/input_method.h"

#include "ui/views/view.h"

#include "ui/views/widget/native_widget_mac.h"

+#include "ui/views/widget/root_view.h"

#include "ui/views/widget/widget.h"

#include "ui/views/widget/widget_observer.h"

@@ -223,7 +224,6 @@ class BridgedNativeWidgetTest : public BridgedNativeWidgetTestBase {

virtual void TearDown() override;

protected:

- // TODO(tapted): Make this a EventCountView from widget_unittest.cc.

scoped_ptr<views::View> view_;

scoped_ptr<BridgedNativeWidget> bridge_;

BridgedContentView* ns_view_; // Weak. Owned by bridge_.

@@ -255,7 +255,7 @@ std::string BridgedNativeWidgetTest::GetText() {

void BridgedNativeWidgetTest::SetUp() {

BridgedNativeWidgetTestBase::SetUp();

- view_.reset(new views::View);

+ view_.reset(new views::internal::RootView(widget_.get()));

tapted 2014/10/16 08:27:07 This lets hostedView_->GetWidget() return non-NULL

base::scoped_nsobject<NSWindow> window([test_window() retain]);

// BridgedNativeWidget expects to be initialized with a hidden (deferred)

« no previous file with comments | « ui/views/cocoa/bridged_content_view.mm ('k') | ui/views/cocoa/views_nswindow_delegate.h » ('j') | ui/views/cocoa/views_nswindow_delegate.h » ('J')