chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.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.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/chrome_web_contents_view_delegate_mac.mm ('k') | chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_browsertest.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.mm

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

index c5fba22d4a075de4bca4583d5dfea4d862ab4d5e..7cae3295c62e8e7379be2f2a625256bd1223dc46 100644

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

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

@@ -70,7 +70,7 @@

// Remove any old preview contents before showing the new one.

if (previewContents_) {

- [previewContents_->GetNativeView() removeFromSuperview];

+ [previewContents_->GetView()->GetNativeView() removeFromSuperview];

previewContents_->WasHidden();

}

@@ -83,7 +83,7 @@

if (previewContents_) {

[[[self view] window] disableScreenUpdatesUntilFlush];

previewContents_->GetView()->SetAllowOverlappingViews(true);

- [[self view] addSubview:previewContents_->GetNativeView()];

+ [[self view] addSubview:previewContents_->GetView()->GetNativeView()];

}

if (drawDropShadow_) {

@@ -106,7 +106,7 @@

- (void)onActivateTabWithContents:(content::WebContents*)contents {

if (previewContents_ == contents) {

if (previewContents_) {

- [previewContents_->GetNativeView() removeFromSuperview];

+ [previewContents_->GetView()->GetNativeView() removeFromSuperview];

previewContents_ = NULL;

}

[self setPreview:NULL

@@ -151,7 +151,7 @@

NSRect previewFrame = bounds;

previewFrame.size.height = [self previewHeightInPixels];

previewFrame.origin.y = NSMaxY(bounds) - NSHeight(previewFrame);

- [previewContents_->GetNativeView() setFrame:previewFrame];

+ [previewContents_->GetView()->GetNativeView() setFrame:previewFrame];

if (dropShadowView_) {

NSRect dropShadowFrame = bounds;