summaryrefslogtreecommitdiffstats
path: root/chrome/app/nibs
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 20:14:44 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 20:14:44 +0000
commit1f59108d85fe7aaa25d2a9906ca80bb7fa635393 (patch)
tree1691d8ca1e9af66233489d797102f9e170e8278e /chrome/app/nibs
parent60cab460a9f891d34efacddd3efc10d89279b6d6 (diff)
downloadchromium_src-1f59108d85fe7aaa25d2a9906ca80bb7fa635393.zip
chromium_src-1f59108d85fe7aaa25d2a9906ca80bb7fa635393.tar.gz
chromium_src-1f59108d85fe7aaa25d2a9906ca80bb7fa635393.tar.bz2
Mac: Give links in infobars a reliable hand cursor.
Do this by switching the text from a NSTextField to a NSTextView. xib changes: Make text field an ordinary NSTextField instead of our own subclass, connect it to labelPlaceholder_ instead of to label_. BUG=?,22187 TEST=Open an infobar with a link (e.g. the new geolocation infobars). The cursor should become a hand on hover, and clicking the info bar should no longer put a caret in there. Other infobars (e.g. "Flash plugin crashed" when you kill the flash process on youtube) should look exactly as before. The cursor should still not become an ibeam. Review URL: http://codereview.chromium.org/1552001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r--chrome/app/nibs/InfoBar.xib34
1 files changed, 12 insertions, 22 deletions
diff --git a/chrome/app/nibs/InfoBar.xib b/chrome/app/nibs/InfoBar.xib
index 265943c..2507f44 100644
--- a/chrome/app/nibs/InfoBar.xib
+++ b/chrome/app/nibs/InfoBar.xib
@@ -205,14 +205,6 @@
<int key="connectionID">10</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">label_</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="293244832"/>
- </object>
- <int key="connectionID">11</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">dismiss:</string>
<reference key="source" ref="1001"/>
@@ -292,6 +284,14 @@
</object>
<int key="connectionID">34</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">labelPlaceholder_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="293244832"/>
+ </object>
+ <int key="connectionID">35</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -430,7 +430,6 @@
<string>15.CustomClassName</string>
<string>15.IBPluginDependency</string>
<string>16.IBPluginDependency</string>
- <string>2.CustomClassName</string>
<string>2.IBPluginDependency</string>
<string>20.IBPluginDependency</string>
<string>21.IBPluginDependency</string>
@@ -454,14 +453,13 @@
<string>HoverCloseButton</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>InfoBarTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{329, 1503}, {480, 31}}</string>
+ <string>{{329, 825}, {480, 31}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -487,7 +485,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">34</int>
+ <int key="maxID">35</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -556,7 +554,7 @@
<string>containerController_</string>
<string>image_</string>
<string>infoBarView_</string>
- <string>label_</string>
+ <string>labelPlaceholder_</string>
<string>okButton_</string>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -565,7 +563,7 @@
<string>HoverCloseButton</string>
<string>id</string>
<string>NSImageView</string>
- <string>NSView</string>
+ <string>InfoBarGradientView</string>
<string>NSTextField</string>
<string>NSButton</string>
</object>
@@ -584,14 +582,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">InfoBarTextField</string>
- <string key="superclassName">NSTextField</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/infobar_text_field.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>