Move devtools and sidebar handling to BWC and ensure the order of layout adjustments

during tab change updates to eliminate UI flickering.

TabContents.xib changes: devtools and sidebar NSSplitViews removed (moved to BrowserWindow.xib),
contentsContainer_ view removed (now it's inserted at runtime).
BrowserWindow.xib chnages: devtools and sidebar NSSplitViews added into FastResizeView.

BUG=22717, 31633
TEST=Run unit_tests, browser_tests and interactive_ui_tests.

Open google.com in one tab (it's easy to spot content relayout on google.com), trigger an infobar
and content scroll bar on another tab (ru.wikipedia.org with translation infobar will do), switch
tabs back and forth. Content should not relayout, scroll bar should not "jump".
Open new tab and make sure bookmark bar is not always visible, open any site which triggers infobar
and big enough to show content scroll bar on another tab, switch tabs back and forth. Content should
not relayout, scroolbar should not "jump".
Repeat the tests above with sidebar opened on any of these tabs, page and sidebar content should not
relayout, sidebar should stay the same width, scrollbar should not "jump".
Repeat the tests above with devtools docked.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58964 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 109 insertions, 101 deletions

diff --git a/chrome/app/nibs/BrowserWindow.xib b/chrome/app/nibs/BrowserWindow.xib
index 30b1c8f..022c2b2 100644
--- a/chrome/app/nibs/BrowserWindow.xib
+++ b/chrome/app/nibs/BrowserWindow.xib
@@ -12,6 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="1"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -48,19 +49,41 @@
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{400, 250}</string>
 				<object class="NSView" key="NSWindowView" id="1006">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSCustomView" id="1858870">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">274</int>
-							<string key="NSFrameSize">{750, 586}</string>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSSplitView" id="321204824">
+									<reference key="NSNextResponder" ref="1858870"/>
+									<int key="NSvFlags">274</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSSplitView" id="267972061">
+											<reference key="NSNextResponder" ref="321204824"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrameSize">{750, 600}</string>
+											<reference key="NSSuperview" ref="321204824"/>
+											<bool key="NSIsVertical">YES</bool>
+											<int key="NSDividerStyle">2</int>
+										</object>
+									</object>
+									<string key="NSFrameSize">{750, 600}</string>
+									<reference key="NSSuperview" ref="1858870"/>
+									<int key="NSDividerStyle">2</int>
+								</object>
+							</object>
+							<string key="NSFrameSize">{750, 600}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<string key="NSClassName">FastResizeView</string>
 						</object>
 					</object>
 					<string key="NSFrameSize">{750, 600}</string>
+					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{400, 272}</string>
@@ -157,6 +180,22 @@
 					</object>
 					<int key="connectionID">90</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">devToolsContainer_</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="321204824"/>
+					</object>
+					<int key="connectionID">94</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">contentsContainer_</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="267972061"/>
+					</object>
+					<int key="connectionID">98</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -229,14 +268,32 @@
 						<reference key="parent" ref="131944810"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">89</int>
+						<reference key="object" ref="529166964"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">84</int>
 						<reference key="object" ref="1858870"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="321204824"/>
+						</object>
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">89</int>
-						<reference key="object" ref="529166964"/>
-						<reference key="parent" ref="0"/>
+						<int key="objectID">91</int>
+						<reference key="object" ref="321204824"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="267972061"/>
+						</object>
+						<reference key="parent" ref="1858870"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">95</int>
+						<reference key="object" ref="267972061"/>
+						<reference key="parent" ref="321204824"/>
 					</object>
 				</object>
 			</object>
@@ -268,15 +325,17 @@
 					<string>84.IBPluginDependency</string>
 					<string>89.IBEditorWindowLastContentRect</string>
 					<string>89.IBPluginDependency</string>
+					<string>91.IBPluginDependency</string>
+					<string>95.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{267, 167}, {750, 600}}</string>
+					<string>{{319, 325}, {750, 600}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{267, 167}, {750, 600}}</string>
+					<string>{{319, 325}, {750, 600}}</string>
 					<boolean value="NO"/>
 					<string>{196, 240}</string>
 					<string>{{357, 418}, {480, 270}}</string>
@@ -298,6 +357,8 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{89, 611}, {236, 393}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -316,7 +377,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">90</int>
+			<int key="maxID">98</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -337,6 +398,14 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">ChromeBrowserWindow</string>
+					<string key="superclassName">ChromeEventProcessingWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">browser/cocoa/chrome_browser_window.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">ChromeEventProcessingWindow</string>
 					<string key="superclassName">NSWindow</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -373,7 +442,7 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FramedBrowserWindow</string>
-					<string key="superclassName">ChromeEventProcessingWindow</string>
+					<string key="superclassName">ChromeBrowserWindow</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="623970533">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">browser/cocoa/framed_browser_window.h</string>
@@ -467,12 +536,16 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>contentsContainer_</string>
+							<string>devToolsContainer_</string>
 							<string>sideTabStripView_</string>
 							<string>tabContentArea_</string>
 							<string>topTabStripView_</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSSplitView</string>
+							<string>NSSplitView</string>
 							<string>TabStripView</string>
 							<string>FastResizeView</string>
 							<string>TabStripView</string>
@@ -482,6 +555,8 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>contentsContainer_</string>
+							<string>devToolsContainer_</string>
 							<string>sideTabStripView_</string>
 							<string>tabContentArea_</string>
 							<string>topTabStripView_</string>
@@ -489,6 +564,14 @@
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBToOneOutletInfo">
+								<string key="name">contentsContainer_</string>
+								<string key="candidateClassName">NSSplitView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">devToolsContainer_</string>
+								<string key="candidateClassName">NSSplitView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">sideTabStripView_</string>
 								<string key="candidateClassName">TabStripView</string>
 							</object>
@@ -785,7 +868,7 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="996113394">
 						<string key="majorKey">IBFrameworkSource</string>
 						<string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string>
 					</object>
@@ -1114,6 +1197,11 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">NSSplitView</string>
+					<string key="superclassName">NSView</string>
+					<reference key="sourceIdentifier" ref="996113394"/>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">NSView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
diff --git a/chrome/app/nibs/TabContents.xib b/chrome/app/nibs/TabContents.xib
index d93dcbb..2419109 100644
--- a/chrome/app/nibs/TabContents.xib
+++ b/chrome/app/nibs/TabContents.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="213"/>
+			<integer value="94"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -57,27 +57,6 @@
 				<object class="NSView" key="NSWindowView" id="675542922">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">274</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSSplitView" id="89435107">
-							<reference key="NSNextResponder" ref="675542922"/>
-							<int key="NSvFlags">274</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSSplitView" id="901624045">
-									<reference key="NSNextResponder" ref="89435107"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrameSize">{480, 360}</string>
-									<reference key="NSSuperview" ref="89435107"/>
-									<bool key="NSIsVertical">YES</bool>
-									<int key="NSDividerStyle">2</int>
-								</object>
-							</object>
-							<string key="NSFrameSize">{480, 360}</string>
-							<reference key="NSSuperview" ref="675542922"/>
-							<int key="NSDividerStyle">2</int>
-						</object>
-					</object>
 					<string key="NSFrameSize">{480, 360}</string>
 					<reference key="NSSuperview"/>
 				</object>
@@ -97,22 +76,6 @@
 					</object>
 					<int key="connectionID">156</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">devToolsContainer_</string>
-						<reference key="source" ref="326691890"/>
-						<reference key="destination" ref="89435107"/>
-					</object>
-					<int key="connectionID">212</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">contentsContainer_</string>
-						<reference key="source" ref="326691890"/>
-						<reference key="destination" ref="901624045"/>
-					</object>
-					<int key="connectionID">216</int>
-				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -150,7 +113,6 @@
 						<reference key="object" ref="675542922"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="89435107"/>
 						</object>
 						<reference key="parent" ref="886393115"/>
 					</object>
@@ -160,23 +122,6 @@
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Application</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">195</int>
-						<reference key="object" ref="89435107"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="901624045"/>
-						</object>
-						<reference key="parent" ref="675542922"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">213</int>
-						<reference key="object" ref="901624045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="parent" ref="89435107"/>
-					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -184,8 +129,6 @@
 				<object class="NSArray" key="dict.sortedKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>-3.IBPluginDependency</string>
-					<string>195.IBPluginDependency</string>
-					<string>213.IBPluginDependency</string>
 					<string>93.IBEditorWindowLastContentRect</string>
 					<string>93.IBPluginDependency</string>
 					<string>93.IBViewEditorWindowController.showingLayoutRectangles</string>
@@ -199,12 +142,10 @@
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{529, 843}, {480, 360}}</string>
+					<string>{{1428, 763}, {480, 360}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>{{529, 843}, {480, 360}}</string>
+					<string>{{1428, 763}, {480, 360}}</string>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{480, 360}</string>
@@ -228,7 +169,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">216</int>
+			<int key="maxID">221</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -291,7 +232,7 @@
 					<string key="className">NSWindow</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/chrome_browser_window.h</string>
+						<string key="minorKey">browser/cocoa/framed_browser_window.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -305,35 +246,14 @@
 					<string key="className">TabContentsController</string>
 					<string key="superclassName">NSViewController</string>
 					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>contentsContainer_</string>
-							<string>devToolsContainer_</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSSplitView</string>
-							<string>NSSplitView</string>
-						</object>
+						<string key="NS.key.0">contentsContainer_</string>
+						<string key="NS.object.0">NSSplitView</string>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>contentsContainer_</string>
-							<string>devToolsContainer_</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">contentsContainer_</string>
-								<string key="candidateClassName">NSSplitView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">devToolsContainer_</string>
-								<string key="candidateClassName">NSSplitView</string>
-							</object>
+						<string key="NS.key.0">contentsContainer_</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">contentsContainer_</string>
+							<string key="candidateClassName">NSSplitView</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">