chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.mm - Issue 11026050: Fix crash when using Instant.

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 11026050: Fix crash when using Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.h » ('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 dc62be6ab5f417f07048f103293645d968940520..cc0a4b9e617b17654865e2e2653252d55b46f251 100644

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

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

@@ -49,6 +49,13 @@ using content::WebContents;

previewContents_ = nil;

}

+- (void)onInsertTabWithContents:(WebContents*)contents {

+ if (previewContents_ == contents) {

+ [previewContents_->GetNativeView() removeFromSuperview];

+ previewContents_ = nil;

+ }

- (BOOL)isShowingPreview {

return previewContents_ != nil;

}