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

Unified Diff: chrome/browser/ui/views/tab_contents/tab_contents_container.cc

Issue 8573029: Fixes regression where showing bookmark bar (or download shelf) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 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
Index: chrome/browser/ui/views/tab_contents/tab_contents_container.cc
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc
index c9635042297350638454d4017fe969f1d428c083..f3b621ffcdd21c0e65050f06739688710f2e68f6 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc
@@ -85,8 +85,17 @@ void TabContentsContainer::Observe(
// TabContentsContainer, View overrides:
void TabContentsContainer::Layout() {
- if (native_container_)
+ if (native_container_) {
+ gfx::Size view_size(native_container_->GetView()->size());
native_container_->GetView()->SetBounds(0, 0, width(), height());
+ // SetBounds does nothing if the bounds haven't changed. We need to force
+ // layout if the bounds haven't changed, but fast resize has.
+ if (view_size.width() == width() && view_size.height() == height() &&
+ native_container_->FastResizeAtLastLayout() &&
+ !native_container_->GetFastResize()) {
+ native_container_->GetView()->Layout();
+ }
+ }
}
void TabContentsContainer::GetAccessibleState(ui::AccessibleViewState* state) {
« no previous file with comments | « chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc ('k') | views/controls/native/native_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698