chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_browsertest.mm - Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods.

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: chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_browsertest.mm

Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.mm ('k') | chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_browsertest.mm

diff --git a/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_browsertest.mm b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_browsertest.mm

index 9063d7513e7533f3c0a71d16db7bc0798629db59..7273d9698c4884e6f7f0aec4bd6a20dbd24323d0 100644

--- a/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_browsertest.mm

+++ b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_browsertest.mm

@@ -13,6 +13,7 @@

#include "chrome/browser/ui/cocoa/tab_contents/preview_drop_shadow_view.h"

#include "chrome/test/base/in_process_browser_test.h"

#include "content/public/browser/web_contents.h"

+#include "content/public/browser/web_contents_view.h"

#import "testing/gtest_mac.h"

class PreviewableContentsControllerTest : public InProcessBrowserTest {

@@ -43,7 +44,7 @@ class PreviewableContentsControllerTest : public InProcessBrowserTest {

InstantSizeUnits units) {

NSRect container_bounds = [[controller_ view] bounds];

NSRect preview_frame =

- [web_contents_->GetNativeView() frame];

+ [web_contents_->GetView()->GetNativeView() frame];

EXPECT_EQ(NSMinX(container_bounds), NSMinX(preview_frame));

EXPECT_EQ(NSWidth(container_bounds), NSWidth(preview_frame));

@@ -73,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(PreviewableContentsControllerTest, SizePerecent) {

InstantSizeUnits units = INSTANT_SIZE_PERCENT;

instant_model_.SetPreviewState(mode, expected_height, units);

- EXPECT_NSEQ([web_contents_->GetNativeView() superview],

+ EXPECT_NSEQ([web_contents_->GetView()->GetNativeView() superview],

[controller_ view]);

VerifyPreviewFrame(expected_height, units);

@@ -90,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(PreviewableContentsControllerTest, SizePixels) {

InstantSizeUnits units = INSTANT_SIZE_PIXELS;

instant_model_.SetPreviewState(mode, expected_height, units);

- EXPECT_NSEQ([web_contents_->GetNativeView() superview],

+ EXPECT_NSEQ([web_contents_->GetView()->GetNativeView() superview],

[controller_ view]);

VerifyPreviewFrame(expected_height, units);