Index: chrome/browser/ui/cocoa/browser_window_controller.mm |
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm |
index dac410f90fe45fd4635a59f9ce7667d3cb193214..6533f6ecf9c9cf755185480be48707e9092aa31e 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm |
@@ -1586,12 +1586,7 @@ enum { |
// Update all the UI bits. |
windowShim_->UpdateTitleBar(); |
- [devToolsController_ updateDevToolsForWebContents:contents |
- withProfile:browser_->profile()]; |
- |
// 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 |
// applicable)? |
windowShim_->BookmarkBarStateChanged( |
@@ -1599,6 +1594,11 @@ enum { |
[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]]; |
} |