summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 18:49:44 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 18:49:44 +0000
commitb5fe86e4e754ea16b709cfb65dc497fe03a7f077 (patch)
tree8f82f5e926f14b2df08e5e59c77d856db2a6f648
parentca5d151013e53bccb197541dd7175e3f12608184 (diff)
downloadchromium_src-b5fe86e4e754ea16b709cfb65dc497fe03a7f077.zip
chromium_src-b5fe86e4e754ea16b709cfb65dc497fe03a7f077.tar.gz
chromium_src-b5fe86e4e754ea16b709cfb65dc497fe03a7f077.tar.bz2
Only show the "bookmarks go here" text after we have loaded the
bookmark model. This prevents a "flash" of the text between startp and model load (when model is not empty). BookmarkBarToolbarView nib change: The "width based tweaker" object (that contains the "Bookmarks go here" text shown when you have no bookmarks) defaults to NOT visible. BUG=http://crbug.com/43102 TEST=New profile. Launch chrome. Make sure you see the "bookmarks go here" text. Add a bookmark; make sure text goes away. Delete it; text comes back. Add a bookmark; text goes away again. Restart Chrome a dozen times. Make sure you never see the text, even for a flash. Review URL: http://codereview.chromium.org/2825012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50366 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/nibs/BookmarkBar.xib27
1 files changed, 3 insertions, 24 deletions
diff --git a/chrome/app/nibs/BookmarkBar.xib b/chrome/app/nibs/BookmarkBar.xib
index 7b99d67..3c9e718 100644
--- a/chrome/app/nibs/BookmarkBar.xib
+++ b/chrome/app/nibs/BookmarkBar.xib
@@ -12,9 +12,9 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="18"/>
<integer value="4"/>
- <integer value="1"/>
+ <integer value="18"/>
+ <integer value="62"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -52,7 +52,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomView" id="1023728927">
<reference key="NSNextResponder" ref="610146462"/>
- <int key="NSvFlags">268</int>
+ <int key="NSvFlags">-2147483380</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="1013234954">
@@ -2223,27 +2223,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">SecurityInterface.framework/Headers/SFAuthorizationView.h</string>
</object>
</object>