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

Unified Diff: chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.mm

Issue 10959049: Change visibility semantics for Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enable a test Created 8 years, 3 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/browser_instant_controller.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 f27b29932ffbda1fd8a88c7de60553e8ce10cf4f..dc62be6ab5f417f07048f103293645d968940520 100644
--- a/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.mm
@@ -33,9 +33,9 @@ using content::WebContents;
NSView* previewView = previewContents_->GetNativeView();
[previewView setFrame:[[self view] bounds]];
- // Hide the active container and add the preview contents.
- [activeContainer_ setHidden:YES];
+ // Add the preview contents.
[[self view] addSubview:previewView];
+ previewContents_->WasShown();
}
- (void)hidePreview {
@@ -43,10 +43,9 @@ using content::WebContents;
if (!previewContents_)
return;
- // Remove the preview contents and reshow the active container.
+ // Remove the preview contents.
[previewContents_->GetNativeView() removeFromSuperview];
- [activeContainer_ setHidden:NO];
-
+ previewContents_->WasHidden();
previewContents_ = nil;
}
« no previous file with comments | « chrome/browser/ui/browser_instant_controller.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698