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

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10915217: Hook up SetInstantPreviewHeight for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move hidden notification, too. 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/views/frame/browser_view.h ('k') | chrome/browser/ui/views/frame/contents_container.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 2af96ba2001fa017cea40ce6872734b497d2f46d..0adc839dcdc8b548d30aa19595456b93c90e0ab6 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1351,12 +1351,15 @@ void BrowserView::Paste() {
}
}
-void BrowserView::ShowInstant(TabContents* preview) {
+void BrowserView::ShowInstant(TabContents* preview,
+ int height,
+ InstantSizeUnits units) {
if (!preview_container_) {
preview_container_ = new views::WebView(browser_->profile());
preview_container_->set_id(VIEW_ID_TAB_CONTAINER);
}
- contents_->SetPreview(preview_container_, preview->web_contents());
+ contents_->SetPreview(preview_container_, preview->web_contents(),
+ height, units);
preview_container_->SetWebContents(preview->web_contents());
#if defined(USE_AURA)
if (search_view_controller_.get())
@@ -1371,7 +1374,7 @@ void BrowserView::HideInstant() {
// The contents must be changed before SetPreview is invoked.
preview_container_->SetWebContents(NULL);
- contents_->SetPreview(NULL, NULL);
+ contents_->SetPreview(NULL, NULL, 100, INSTANT_SIZE_PERCENT);
delete preview_container_;
preview_container_ = NULL;
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/frame/contents_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698