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

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

Issue 11413018: alternate ntp: implement searchbox api for instant overlay to adopt themes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed sreeram's comments, fixed to not set theme fields if no theme Created 8 years, 1 month 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/common/chrome_notification_types.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 13996a4855329f55eb0c95519a25d104c25dcc1c..bcc59cae232d87d5a5e7b3287310d2793a501b52 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2007,12 +2007,21 @@ std::string BrowserView::GetClassName() const {
void BrowserView::Layout() {
if (ignore_layout_)
return;
+
+ int prev_content_height = contents_container_->height();
+
views::View::Layout();
// The status bubble position requires that all other layout finish first.
LayoutStatusBubble();
MaybeStackBookmarkBarAtTop();
+
+ if (browser_->instant_controller() &&
+ prev_content_height != contents_container_->height()) {
+ browser_->instant_controller()->SetContentHeight(
+ contents_container_->height());
+ }
}
void BrowserView::PaintChildren(gfx::Canvas* canvas) {
« no previous file with comments | « chrome/browser/ui/browser_instant_controller.cc ('k') | chrome/common/chrome_notification_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698