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

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 131093004: [DevTools] Update DevTools after bookmarks and infobar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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]];
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698