Commit 6d88aed5 authored by dgozman@chromium.org's avatar dgozman@chromium.org

[DevTools] Update DevTools after bookmarks and infobar.

Previously, updating bookmark bar could have cause page/devtools resize.
With new layout logic implemented in DevToolsController, resizing
page/devtools after everything else guarantees single resize operation.

BUG=331295

Review URL: https://codereview.chromium.org/131093004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245628 0039d316-1c4b-4281-b951-d872f2087c98
parent defc21eb
...@@ -1586,12 +1586,7 @@ enum { ...@@ -1586,12 +1586,7 @@ enum {
// Update all the UI bits. // Update all the UI bits.
windowShim_->UpdateTitleBar(); windowShim_->UpdateTitleBar();
[devToolsController_ updateDevToolsForWebContents:contents
withProfile:browser_->profile()];
// Update the bookmark bar. // Update the bookmark bar.
// Must do it after devtools updates, otherwise bookmark bar might
// call resizeView -> layoutSubviews and cause unnecessary relayout.
// TODO(viettrungluu): perhaps update to not terminate running animations (if // TODO(viettrungluu): perhaps update to not terminate running animations (if
// applicable)? // applicable)?
windowShim_->BookmarkBarStateChanged( windowShim_->BookmarkBarStateChanged(
...@@ -1599,6 +1594,11 @@ enum { ...@@ -1599,6 +1594,11 @@ enum {
[infoBarContainerController_ changeWebContents:contents]; [infoBarContainerController_ changeWebContents:contents];
// Must do this after bookmark and infobar updates to avoid
// unnecesary resize in contents.
[devToolsController_ updateDevToolsForWebContents:contents
withProfile:browser_->profile()];
[self updateAllowOverlappingViews:[self inPresentationMode]]; [self updateAllowOverlappingViews:[self inPresentationMode]];
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment