summaryrefslogtreecommitdiffstats
path: root/chrome/app/nibs
diff options
context:
space:
mode:
authorxians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 12:23:15 +0000
committerxians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 12:23:15 +0000
commit5cc0191b3b4c9245a9db7b1cbe980f1e369600c9 (patch)
tree8e534173b2c4945e95c2624bbf48da1c9618174c /chrome/app/nibs
parent9c0d9207e21b2b0792c4531d93c5771f1114dd19 (diff)
downloadchromium_src-5cc0191b3b4c9245a9db7b1cbe980f1e369600c9.zip
chromium_src-5cc0191b3b4c9245a9db7b1cbe980f1e369600c9.tar.gz
chromium_src-5cc0191b3b4c9245a9db7b1cbe980f1e369600c9.tar.bz2
This patch adds mic/camera selection menu to the content setting bubble on Mac.
It allows the users to select a different device from the omnibox since the device selection UI in content setting is not noticable to the normal users. Note that a reload action is required to have the new setting take effect. Relevant design doc is in https://docs.google.com/a/google.com/presentation/d/1Ohksd45T-1fjQpdElKx0cRrnZin3j85oxDKbuBILnuk/edit#slide=id.g9a0c6e39_00 page 2 XIB changes: * Added a Custom View to the Info Bubble View in chrome/app/nibs/ContentBlockedPopups.xib. This Custom View is linking to mediaMenusContainer_ in the ContentSettingBubbleController, it is where the media menus locates. The screenshots for the new UI: http://imgur.com/xrbMyCq http://imgur.com/RRvLvqk BUG=174357 TEST=go to https://webrtc-demos.appspot.com/html/pc1.html, allow the media request, click the camera icon on the omnibox, then select a different device, reload the page, then the new setting should kick in. Review URL: https://codereview.chromium.org/12388046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r--chrome/app/nibs/ContentBlockedMedia.xib364
1 files changed, 207 insertions, 157 deletions
diff --git a/chrome/app/nibs/ContentBlockedMedia.xib b/chrome/app/nibs/ContentBlockedMedia.xib
index 1188d13..0069d31 100644
--- a/chrome/app/nibs/ContentBlockedMedia.xib
+++ b/chrome/app/nibs/ContentBlockedMedia.xib
@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">12C60</string>
- <string key="IBDocument.InterfaceBuilderVersion">2549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2844</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2549</string>
+ <string key="NS.object.0">2844</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -45,7 +45,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{196, 376}, {316, 134}}</string>
+ <string key="NSWindowRect">{{196, 376}, {316, 192}}</string>
<int key="NSWTFlags">536873984</int>
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">InfoBubbleWindow</string>
@@ -61,10 +61,22 @@
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSCustomView" id="108440459">
+ <reference key="NSNextResponder" ref="301729179"/>
+ <int key="NSvFlags">290</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <string key="NSFrame">{{20, 52}, {262, 52}}</string>
+ <reference key="NSSuperview" ref="301729179"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="730386640"/>
+ <string key="NSClassName">NSView</string>
+ </object>
<object class="NSTextField" id="266815090">
<reference key="NSNextResponder" ref="301729179"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{17, 100}, {282, 14}}</string>
+ <string key="NSFrame">{{17, 158}, {282, 14}}</string>
<reference key="NSSuperview" ref="301729179"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="126329017"/>
@@ -103,7 +115,7 @@
<object class="NSMatrix" id="126329017">
<reference key="NSNextResponder" ref="301729179"/>
<int key="NSvFlags">290</int>
- <string key="NSFrame">{{20, 54}, {276, 38}}</string>
+ <string key="NSFrame">{{20, 112}, {276, 38}}</string>
<reference key="NSSuperview" ref="301729179"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="913795455"/>
@@ -312,10 +324,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSBox" id="913795455">
<reference key="NSNextResponder" ref="301729179"/>
<int key="NSvFlags">34</int>
- <string key="NSFrame">{{20, 43}, {276, 5}}</string>
+ <string key="NSFrame">{{20, 41}, {276, 5}}</string>
<reference key="NSSuperview" ref="301729179"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="730386640"/>
+ <reference key="NSNextKeyView" ref="108440459"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67108864</int>
@@ -338,89 +350,89 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
</object>
- <object class="NSCustomView" id="730386640">
- <reference key="NSNextResponder" ref="301729179"/>
- <int key="NSvFlags">294</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButton" id="91589614">
- <reference key="NSNextResponder" ref="730386640"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{15, 13}, {164, 28}}</string>
- <reference key="NSSuperview" ref="730386640"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="395762087"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="319182835">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">134348800</int>
- <string key="NSContents">^IDS_MEDIASTREAM_BUBBLE_MANAGE_LINK</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="91589614"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- </object>
- <string key="NSFrameSize">{194, 37}</string>
- <reference key="NSSuperview" ref="301729179"/>
+ </object>
+ <string key="NSFrameSize">{316, 192}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="266815090"/>
+ <string key="NSClassName">InfoBubbleView</string>
+ </object>
+ <object class="NSCustomView" id="395762087">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">291</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSButton" id="433059244">
+ <reference key="NSNextResponder" ref="395762087"/>
+ <int key="NSvFlags">289</int>
+ <string key="NSFrame">{{40, 13}, {68, 28}}</string>
+ <reference key="NSSuperview" ref="395762087"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="91589614"/>
- <string key="NSClassName">GTMWidthBasedTweaker</string>
- </object>
- <object class="NSCustomView" id="395762087">
- <reference key="NSNextResponder" ref="301729179"/>
- <int key="NSvFlags">291</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButton" id="433059244">
- <reference key="NSNextResponder" ref="395762087"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{40, 13}, {68, 28}}</string>
- <reference key="NSSuperview" ref="395762087"/>
- <reference key="NSWindow"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="255173005">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">134348800</int>
- <string key="NSContents">^IDS_DONE</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="433059244"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="255173005">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">134348800</int>
+ <string key="NSContents">^IDS_DONE</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="433059244"/>
+ <int key="NSButtonFlags">-2038284288</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
</object>
- <string key="NSFrame">{{193, 0}, {123, 37}}</string>
- <reference key="NSSuperview" ref="301729179"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ </object>
+ <string key="NSFrame">{{193, 0}, {123, 37}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="433059244"/>
+ <string key="NSClassName">GTMWidthBasedTweaker</string>
+ </object>
+ <object class="NSCustomView" id="730386640">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">294</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSButton" id="91589614">
+ <reference key="NSNextResponder" ref="730386640"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{15, 13}, {164, 28}}</string>
+ <reference key="NSSuperview" ref="730386640"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="433059244"/>
- <string key="NSClassName">GTMWidthBasedTweaker</string>
+ <reference key="NSNextKeyView" ref="395762087"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="319182835">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">134348800</int>
+ <string key="NSContents">^IDS_MEDIASTREAM_BUBBLE_MANAGE_LINK</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="91589614"/>
+ <int key="NSButtonFlags">-2038284288</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</object>
- <string key="NSFrameSize">{316, 134}</string>
+ <string key="NSFrameSize">{194, 37}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="266815090"/>
- <string key="NSClassName">InfoBubbleView</string>
+ <reference key="NSNextKeyView" ref="91589614"/>
+ <string key="NSClassName">GTMWidthBasedTweaker</string>
</object>
</object>
- <string key="NSFrameSize">{316, 134}</string>
+ <string key="NSFrameSize">{316, 192}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="301729179"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1200, 1898}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -459,12 +471,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="connectionID">24</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">manageBlocking:</string>
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">allowBlockRadioGroup_</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="91589614"/>
+ <reference key="destination" ref="126329017"/>
</object>
- <int key="connectionID">25</int>
+ <int key="connectionID">27</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">titleLabel_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="266815090"/>
+ </object>
+ <int key="connectionID">30</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -476,19 +496,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">allowBlockRadioGroup_</string>
+ <string key="label">doneButton_</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="126329017"/>
+ <reference key="destination" ref="433059244"/>
</object>
- <int key="connectionID">27</int>
+ <int key="connectionID">32</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">titleLabel_</string>
+ <object class="IBActionConnection" key="connection">
+ <string key="label">manageBlocking:</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="266815090"/>
+ <reference key="destination" ref="91589614"/>
</object>
- <int key="connectionID">30</int>
+ <int key="connectionID">25</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -500,11 +520,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">doneButton_</string>
+ <string key="label">mediaMenusContainer_</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="433059244"/>
+ <reference key="destination" ref="108440459"/>
</object>
- <int key="connectionID">32</int>
+ <int key="connectionID">54</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -575,76 +595,43 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="301729179"/>
- </object>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4</int>
- <reference key="object" ref="301729179"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="126329017"/>
- <reference ref="913795455"/>
- <reference ref="266815090"/>
<reference ref="730386640"/>
<reference ref="395762087"/>
</object>
- <reference key="parent" ref="1006"/>
+ <reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="266815090"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="157361777"/>
- </object>
- <reference key="parent" ref="301729179"/>
+ <int key="objectID">20</int>
+ <reference key="object" ref="670916757"/>
+ <reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="157361777"/>
- <reference key="parent" ref="266815090"/>
+ <int key="objectID">21</int>
+ <reference key="object" ref="684547419"/>
+ <reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">9</int>
- <reference key="object" ref="126329017"/>
+ <int key="objectID">29</int>
+ <reference key="object" ref="395762087"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="193088222"/>
- <reference ref="619648789"/>
- <reference ref="789299084"/>
+ <reference ref="433059244"/>
</object>
- <reference key="parent" ref="301729179"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">10</int>
- <reference key="object" ref="193088222"/>
- <reference key="parent" ref="126329017"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="619648789"/>
- <reference key="parent" ref="126329017"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">12</int>
- <reference key="object" ref="789299084"/>
- <reference key="parent" ref="126329017"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">19</int>
- <reference key="object" ref="913795455"/>
- <reference key="parent" ref="301729179"/>
+ <reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">20</int>
- <reference key="object" ref="670916757"/>
- <reference key="parent" ref="0"/>
+ <int key="objectID">17</int>
+ <reference key="object" ref="433059244"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="255173005"/>
+ </object>
+ <reference key="parent" ref="395762087"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">21</int>
- <reference key="object" ref="684547419"/>
- <reference key="parent" ref="0"/>
+ <int key="objectID">18</int>
+ <reference key="object" ref="255173005"/>
+ <reference key="parent" ref="433059244"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">28</int>
@@ -653,7 +640,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="91589614"/>
</object>
- <reference key="parent" ref="301729179"/>
+ <reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">15</int>
@@ -670,27 +657,66 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="parent" ref="91589614"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">29</int>
- <reference key="object" ref="395762087"/>
+ <int key="objectID">4</int>
+ <reference key="object" ref="301729179"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="433059244"/>
+ <reference ref="913795455"/>
+ <reference ref="266815090"/>
+ <reference ref="126329017"/>
+ <reference ref="108440459"/>
+ </object>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">9</int>
+ <reference key="object" ref="126329017"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="193088222"/>
+ <reference ref="619648789"/>
+ <reference ref="789299084"/>
</object>
<reference key="parent" ref="301729179"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">17</int>
- <reference key="object" ref="433059244"/>
+ <int key="objectID">12</int>
+ <reference key="object" ref="789299084"/>
+ <reference key="parent" ref="126329017"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">11</int>
+ <reference key="object" ref="619648789"/>
+ <reference key="parent" ref="126329017"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">10</int>
+ <reference key="object" ref="193088222"/>
+ <reference key="parent" ref="126329017"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="266815090"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="255173005"/>
+ <reference ref="157361777"/>
</object>
- <reference key="parent" ref="395762087"/>
+ <reference key="parent" ref="301729179"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">18</int>
- <reference key="object" ref="255173005"/>
- <reference key="parent" ref="433059244"/>
+ <int key="objectID">8</int>
+ <reference key="object" ref="157361777"/>
+ <reference key="parent" ref="266815090"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">19</int>
+ <reference key="object" ref="913795455"/>
+ <reference key="parent" ref="301729179"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">49</int>
+ <reference key="object" ref="108440459"/>
+ <reference key="parent" ref="301729179"/>
</object>
</object>
</object>
@@ -718,6 +744,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>28.IBPluginDependency</string>
<string>29.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
+ <string>49.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
@@ -747,6 +774,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</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">
@@ -761,7 +789,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
- <int key="maxID">32</int>
+ <int key="maxID">54</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -813,6 +841,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>learnMoreLinkClicked:</string>
<string>load:</string>
<string>manageBlocking:</string>
+ <string>mediaMenuChanged:</string>
<string>showMoreInfo:</string>
</object>
<object class="NSArray" key="dict.values">
@@ -823,6 +852,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -834,6 +864,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>learnMoreLinkClicked:</string>
<string>load:</string>
<string>manageBlocking:</string>
+ <string>mediaMenuChanged:</string>
<string>showMoreInfo:</string>
</object>
<object class="NSArray" key="dict.values">
@@ -859,6 +890,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">mediaMenuChanged:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">showMoreInfo:</string>
<string key="candidateClassName">id</string>
</object>
@@ -874,6 +909,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>doneButton_</string>
<string>loadButton_</string>
<string>manageButton_</string>
+ <string>mediaMenusContainer_</string>
<string>titleLabel_</string>
</object>
<object class="NSArray" key="dict.values">
@@ -884,6 +920,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSButton</string>
<string>NSButton</string>
<string>NSButton</string>
+ <string>NSView</string>
<string>NSTextField</string>
</object>
</object>
@@ -897,6 +934,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>doneButton_</string>
<string>loadButton_</string>
<string>manageButton_</string>
+ <string>mediaMenusContainer_</string>
<string>titleLabel_</string>
</object>
<object class="NSArray" key="dict.values">
@@ -926,6 +964,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
+ <string key="name">mediaMenusContainer_</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
<string key="name">titleLabel_</string>
<string key="candidateClassName">NSTextField</string>
</object>
@@ -1093,6 +1135,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="minorKey">./Classes/InfoBubbleWindow.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UnderlayOpenGLHostingWindow</string>
+ <string key="superclassName">NSWindow</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/UnderlayOpenGLHostingWindow.h</string>
+ </object>
+ </object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>