Skip to content

Commit

Permalink
Mac Web Intents Part 14: Migrate extension install prompt
Browse files Browse the repository at this point in the history 
This CL makes the following changes to the extension install prompt:
  - the dialog is now displayed in a constrained window
  - the UI has been updated to use the new constrained window UI
  - the main UI is now a view that can be embedded in any window. This will be used by the web intents picker to embed the extension install prompt in the picker UI.

XIB changes:
  - change all the xibs to use a view controller instead of a window controller
  - change the buttons to use the new constrained window look

Screenshot: http://i.imgur.com/V0kKF.png

BUG=152010, 95455
TBR=thakis@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11014012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161306 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
sail@chromium.org committed Oct 11, 2012
1 parent 7a899fe commit 89e7d4a
Show file tree
Hide file tree
Showing 18 changed files with 2,614 additions and 2,925 deletions.
993 changes: 424 additions & 569 deletions chrome/app/nibs/ExtensionInstallPrompt.xib
View file

Large diffs are not rendered by default.

723 changes: 354 additions & 369 deletions chrome/app/nibs/ExtensionInstallPromptBundle.xib
View file

Large diffs are not rendered by default.

1,016 changes: 501 additions & 515 deletions chrome/app/nibs/ExtensionInstallPromptInline.xib
View file

Large diffs are not rendered by default.

466 changes: 220 additions & 246 deletions chrome/app/nibs/ExtensionInstallPromptNoWarnings.xib
View file

Large diffs are not rendered by default.

54 changes: 6 additions & 48 deletions chrome/app/nibs/ExtensionInstalledBubble.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,42 +597,14 @@
<string key="className">BaseBubbleController</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>bubble_</string>
<string>eventTap_</string>
<string>resignationObserver_</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>InfoBubbleView</string>
<string>id</string>
<string>id</string>
</object>
<string key="NS.key.0">bubble_</string>
<string key="NS.object.0">InfoBubbleView</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>bubble_</string>
<string>eventTap_</string>
<string>resignationObserver_</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">bubble_</string>
<string key="candidateClassName">InfoBubbleView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">eventTap_</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">resignationObserver_</string>
<string key="candidateClassName">id</string>
</object>
<string key="NS.key.0">bubble_</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">bubble_</string>
<string key="candidateClassName">InfoBubbleView</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
Expand Down Expand Up @@ -664,45 +636,31 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>closeWindow:</string>
<string>extensionUnloaded:</string>
<string>onManageShortcutClicked:</string>
<string>showWindow:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>closeWindow:</string>
<string>extensionUnloaded:</string>
<string>onManageShortcutClicked:</string>
<string>showWindow:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">closeWindow:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">extensionUnloaded:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">onManageShortcutClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showWindow:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
Expand Down
215 changes: 1 addition & 214 deletions chrome/app/nibs/ExtensionInstalledBubbleBundle.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{12, 113}, {314, 17}}</string>
<reference key="NSSuperview" ref="914312036"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="229929953">
<int key="NSCellFlags">67108864</int>
Expand Down Expand Up @@ -102,7 +101,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{12, 63}, {314, 17}}</string>
<reference key="NSSuperview" ref="914312036"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="353810369">
<int key="NSCellFlags">67108864</int>
Expand All @@ -120,7 +118,6 @@
<int key="NSvFlags">-2147483380</int>
<string key="NSFrame">{{12, 38}, {314, 17}}</string>
<reference key="NSSuperview" ref="914312036"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="85879595">
<int key="NSCellFlags">67108864</int>
Expand All @@ -142,7 +139,6 @@
<int key="NSvFlags">-2147483380</int>
<string key="NSFrame">{{12, 88}, {314, 17}}</string>
<reference key="NSSuperview" ref="914312036"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="226927715">
<int key="NSCellFlags">67108864</int>
Expand All @@ -160,7 +156,6 @@
<int key="NSvFlags">265</int>
<string key="NSFrame">{{342, 114}, {16, 16}}</string>
<reference key="NSSuperview" ref="914312036"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="2621715">
<int key="NSCellFlags">67108864</int>
Expand All @@ -180,13 +175,11 @@
</object>
<string key="NSFrameSize">{373, 161}</string>
<reference key="NSSuperview" ref="177257090"/>
<reference key="NSWindow"/>
<string key="NSClassName">InfoBubbleView</string>
</object>
</object>
<string key="NSFrameSize">{368, 125}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {2560, 1578}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
Expand Down Expand Up @@ -476,213 +469,7 @@
<nil key="sourceID"/>
<int key="maxID">59</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">BaseBubbleController</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">bubble_</string>
<string key="NS.object.0">InfoBubbleView</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">bubble_</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">bubble_</string>
<string key="candidateClassName">InfoBubbleView</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/BaseBubbleController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ChromeEventProcessingWindow</string>
<string key="superclassName">UnderlayOpenGLHostingWindow</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ChromeEventProcessingWindow.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ExtensionInstalledBubbleController</string>
<string key="superclassName">BaseBubbleController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>closeWindow:</string>
<string>onManageShortcutClicked:</string>
<string>showWindow:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>closeWindow:</string>
<string>onManageShortcutClicked:</string>
<string>showWindow:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">closeWindow:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">onManageShortcutClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showWindow:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>closeButton_</string>
<string>extensionInstalledInfoMsg_</string>
<string>extensionInstalledMsg_</string>
<string>extraInfoMsg_</string>
<string>failedHeadingMsg_</string>
<string>failedItemsMsg_</string>
<string>iconImage_</string>
<string>installedHeadingMsg_</string>
<string>installedItemsMsg_</string>
<string>manageShortcutLink_</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>HoverCloseButton</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSImageView</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSButton</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>closeButton_</string>
<string>extensionInstalledInfoMsg_</string>
<string>extensionInstalledMsg_</string>
<string>extraInfoMsg_</string>
<string>failedHeadingMsg_</string>
<string>failedItemsMsg_</string>
<string>iconImage_</string>
<string>installedHeadingMsg_</string>
<string>installedItemsMsg_</string>
<string>manageShortcutLink_</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">closeButton_</string>
<string key="candidateClassName">HoverCloseButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">extensionInstalledInfoMsg_</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">extensionInstalledMsg_</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">extraInfoMsg_</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">failedHeadingMsg_</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">failedItemsMsg_</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">iconImage_</string>
<string key="candidateClassName">NSImageView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">installedHeadingMsg_</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">installedItemsMsg_</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">manageShortcutLink_</string>
<string key="candidateClassName">NSButton</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ExtensionInstalledBubbleController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">HoverButton</string>
<string key="superclassName">NSButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/HoverButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">HoverCloseButton</string>
<string key="superclassName">HoverButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/HoverCloseButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">InfoBubbleView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/InfoBubbleView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">InfoBubbleWindow</string>
<string key="superclassName">ChromeEventProcessingWindow</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<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>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
Expand Down
Loading

0 comments on commit 89e7d4a

Please sign in to comment.