chrome/browser/ui/views/frame/browser_view.cc - Issue 1009533005: Update size of RWVH after bookmark bar is hidden

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

Issue 1009533005: Update size of RWVH after bookmark bar is hidden Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: in BrowserView Created 5 years, 9 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

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 6113a0991cfec87de33aa9946c695ef9cab53c8b..ecd99514a3b4d4d2a40377f626b313cfab205f87 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -790,8 +790,13 @@ void BrowserView::BookmarkBarStateChanged(

bookmark_bar_view_->SetBookmarkBarState(new_state, change_type);

}

- if (MaybeShowBookmarkBar(GetActiveWebContents()))

+ if (MaybeShowBookmarkBar(GetActiveWebContents())) {

Layout();

+ content::RenderWidgetHostView* rwhv =

sky 2015/03/25 20:45:36 Won't Layout() end up in ContentsLayoutManager and

scottmg 2015/03/25 22:22:06 Yeah, it does. On the initial navigate, the delega

Yeah, it does. On the initial navigate, the delegate_ on the aura::Window* ends up going to https://code.google.com/p/chromium/codesearch#chromium/src/ui/views/controls/... which does nothing. ** views.dll!views::NativeViewHostAura::ClippingWindowDelegate::OnBoundsChanged(const gfx::Rect & old_bounds, const gfx::Rect & new_bounds) Line 32 C++ aura.dll!aura::Window::OnWindowBoundsChanged(const gfx::Rect & old_bounds) Line 1361 C++ aura.dll!base::internal::RunnableAdapter<void (__thiscall aura::Window::*)(gfx::Rect const &)>::Run(aura::Window * object, const gfx::Rect & <args_0>) Line 176 C++ aura.dll!base::internal::InvokeHelper<0,void,base::internal::RunnableAdapter<void (__thiscall aura::Window::*)(gfx::Rect const &)>,base::internal::TypeList<aura::Window *,gfx::Rect const &> >::MakeItSo(base::internal::RunnableAdapter<void (__thiscall aura::Window::*)(gfx::Rect const &)> runnable, aura::Window * <args_0>, const gfx::Rect & <args_1>) Line 294 C++ aura.dll!base::internal::Invoker<IndexSequence<0,1>,base::internal::BindState<base::internal::RunnableAdapter<void (__thiscall aura::Window::*)(gfx::Rect const &)>,void __cdecl(aura::Window *,gfx::Rect const &),base::internal::TypeList<base::internal::UnretainedWrapper<aura::Window>,gfx::Rect> >,base::internal::TypeList<base::internal::UnwrapTraits<base::internal::UnretainedWrapper<aura::Window> >,base::internal::UnwrapTraits<gfx::Rect> >,base::internal::InvokeHelper<0,void,base::internal::RunnableAdapter<void (__thiscall aura::Window::*)(gfx::Rect const &)>,base::internal::TypeList<aura::Window *,gfx::Rect const &> >,void __cdecl(void)>::Run(base::internal::BindStateBase * base) Line 346 C++ compositor.dll!base::Callback<void __cdecl(void)>::Run() Line 396 C++ compositor.dll!ui::Layer::SetBoundsFromAnimation(const gfx::Rect & bounds) Line 872 C++ compositor.dll!ui::LayerAnimator::SetBounds(const gfx::Rect & value) Line 102 C++ compositor.dll!ui::Layer::SetBounds(const gfx::Rect & bounds) Line 246 C++ aura.dll!aura::Window::SetBoundsInternal(const gfx::Rect & new_bounds) Line 919 C++ aura.dll!aura::Window::SetBounds(const gfx::Rect & new_bounds) Line 455 C++ views.dll!views::NativeViewHostAura::ShowWidget(int x, int y, int w, int h) Line 160 C++ views.dll!views::NativeViewHost::Layout() Line 97 C++ views.dll!views::View::BoundsChanged(const gfx::Rect & previous_bounds) Line 1941 C++ views.dll!views::View::SetBoundsRect(const gfx::Rect & bounds) Line 289 C++ webview.dll!views::WebView::OnBoundsChanged(const gfx::Rect & previous_bounds) Line 163 C++ views.dll!views::View::BoundsChanged(const gfx::Rect & previous_bounds) Line 1937 C++ views.dll!views::View::SetBoundsRect(const gfx::Rect & bounds) Line 289 C++ chrome.dll!ContentsLayoutManager::Layout(views::View * contents_container) Line 62 C++ views.dll!views::View::Layout() Line 536 C++ views.dll!views::View::SetBoundsRect(const gfx::Rect & bounds) Line 274 C++ chrome.dll!BrowserViewLayout::LayoutContentsContainerView(int top, int bottom) Line 478 C++ chrome.dll!BrowserViewLayout::Layout(views::View * browser_view) Line 349 C++ views.dll!views::View::Layout() Line 536 C++ chrome.dll!BrowserView::Layout() Line 1904 C++ chrome.dll!BrowserView::BookmarkBarStateChanged(BookmarkBar::AnimateChangeType change_type) Line 787 C++ chrome.dll!Browser::UpdateBookmarkBarState(Browser::BookmarkBarStateChangeReason reason) Line 2534 C++ chrome.dll!Browser::DidNavigateMainFramePostCommit(content::WebContents * web_contents) Line 1662 C++ vs. when I resize the top level window it delegates back to WebContentsViewAura::OnBoundsChanged: compositor.dll!ui::SnapLayerToPhysicalPixelBoundary(ui::Layer * snapped_layer, ui::Layer * layer_to_snap) Line 96 C++ content.dll!content::RenderWidgetHostViewAura::SnapToPhysicalPixelBoundary() Line 2479 C++ content.dll!content::RenderWidgetHostViewAura::InternalSetBounds(const gfx::Rect & rect) Line 2491 C++ content.dll!content::RenderWidgetHostViewAura::SetSize(const gfx::Size & size) Line 657 C++ content.dll!content::WebContentsViewAura::SizeChangedCommon(const gfx::Size & size) Line 776 C++ content.dll!content::WebContentsViewAura::OnBoundsChanged(const gfx::Rect & old_bounds, const gfx::Rect & new_bounds) Line 1426 C++ ** aura.dll!aura::Window::OnWindowBoundsChanged(const gfx::Rect & old_bounds) Line 1361 C++ aura.dll!base::internal::RunnableAdapter<void (__thiscall aura::Window::*)(gfx::Rect const &)>::Run(aura::Window * object, const gfx::Rect & <args_0>) Line 176 C++ aura.dll!base::internal::InvokeHelper<0,void,base::internal::RunnableAdapter<void (__thiscall aura::Window::*)(gfx::Rect const &)>,base::internal::TypeList<aura::Window *,gfx::Rect const &> >::MakeItSo(base::internal::RunnableAdapter<void (__thiscall aura::Window::*)(gfx::Rect const &)> runnable, aura::Window * <args_0>, const gfx::Rect & <args_1>) Line 294 C++ aura.dll!base::internal::Invoker<IndexSequence<0,1>,base::internal::BindState<base::internal::RunnableAdapter<void (__thiscall aura::Window::*)(gfx::Rect const &)>,void __cdecl(aura::Window *,gfx::Rect const &),base::internal::TypeList<base::internal::UnretainedWrapper<aura::Window>,gfx::Rect> >,base::internal::TypeList<base::internal::UnwrapTraits<base::internal::UnretainedWrapper<aura::Window> >,base::internal::UnwrapTraits<gfx::Rect> >,base::internal::InvokeHelper<0,void,base::internal::RunnableAdapter<void (__thiscall aura::Window::*)(gfx::Rect const &)>,base::internal::TypeList<aura::Window *,gfx::Rect const &> >,void __cdecl(void)>::Run(base::internal::BindStateBase * base) Line 346 C++ compositor.dll!base::Callback<void __cdecl(void)>::Run() Line 396 C++ compositor.dll!ui::Layer::SetBoundsFromAnimation(const gfx::Rect & bounds) Line 872 C++ compositor.dll!ui::LayerAnimator::SetBounds(const gfx::Rect & value) Line 102 C++ compositor.dll!ui::Layer::SetBounds(const gfx::Rect & bounds) Line 246 C++ aura.dll!aura::Window::SetBoundsInternal(const gfx::Rect & new_bounds) Line 919 C++ aura.dll!aura::Window::SetBounds(const gfx::Rect & new_bounds) Line 455 C++ views.dll!views::NativeViewHostAura::ShowWidget(int x, int y, int w, int h) Line 164 C++ views.dll!views::NativeViewHost::Layout() Line 97 C++ views.dll!views::View::BoundsChanged(const gfx::Rect & previous_bounds) Line 1941 C++ views.dll!views::View::SetBoundsRect(const gfx::Rect & bounds) Line 289 C++ webview.dll!views::WebView::OnBoundsChanged(const gfx::Rect & previous_bounds) Line 163 C++ views.dll!views::View::BoundsChanged(const gfx::Rect & previous_bounds) Line 1937 C++ views.dll!views::View::SetBoundsRect(const gfx::Rect & bounds) Line 289 C++ chrome.dll!ContentsLayoutManager::Layout(views::View * contents_container) Line 62 C++ I don't understand what that ClippingWindowDelegate is supposed to be doing. I tried (in ps#1) to forward to its contained native_view_ and that fixed the problem too, but I couldn't come up with a views_unittest that actually needed that, so I went this way instead. Does any of that make sense?

+ GetActiveWebContents()->GetRenderWidgetHostView();

+ if (rwhv)

+ rwhv->SetSize(contents_container_->size());

+ }

}

void BrowserView::UpdateDevTools() {

« no previous file with comments | « no previous file | no next file » | no next file with comments »