diff options
author | snej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-14 00:13:13 +0000 |
---|---|---|
committer | snej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-14 00:13:13 +0000 |
commit | b0119722e29517d9ac0d055df6fc26afdad1be95 (patch) | |
tree | 6ce33f930a8f2c7f5e08a72d000c6fabb7744f3f /chrome/app | |
parent | c9bb06f4cee992d31f97ee893663a476d4efba0c (diff) | |
download | chromium_src-b0119722e29517d9ac0d055df6fc26afdad1be95.zip chromium_src-b0119722e29517d9ac0d055df6fc26afdad1be95.tar.gz chromium_src-b0119722e29517d9ac0d055df6fc26afdad1be95.tar.bz2 |
Change bookmark manager object model.
This is in preparation for adding Recents/Search. Apologies for the number of diffs, but most of them are basically just renaming, especially 'id' --> 'BookmarkItem*' and 'node'-->'item'.
The code now has a real Objective-C BookmarkItem class instead of using opaque 'id's. This allows all the C++ BookmarkNode calls to be collected into one source file. It will also in the future allow creating fake collections of bookmarks, necessary for the Recents and Search features.
Also some refactoring of the drag/clipboard code, which now uses a static array instead of an instance variable to hold dragged items; this will be necessary to handle moves between trees (coming in the next checkin.)
Minor xib changes: Shorten URLs in the middle not at the end, and remove borders of table/outline views.
BUG=32080
TEST=Added BookmarkItemTest, modified existing unit tests.
Review URL: http://codereview.chromium.org/551013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/nibs/BookmarkManager.xib | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/chrome/app/nibs/BookmarkManager.xib b/chrome/app/nibs/BookmarkManager.xib index 7a77cf3..2f49b6e 100644 --- a/chrome/app/nibs/BookmarkManager.xib +++ b/chrome/app/nibs/BookmarkManager.xib @@ -9,7 +9,7 @@ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="7"/> - <integer value="11"/> + <integer value="10"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -478,7 +478,7 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> <object class="NSTableView" id="580246752"> <reference key="NSNextResponder" ref="764939157"/> <int key="NSvFlags">274</int> - <string key="NSFrameSize">{142, 592}</string> + <string key="NSFrameSize">{144, 594}</string> <reference key="NSSuperview" ref="764939157"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> @@ -490,7 +490,7 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn" id="1069362144"> <string key="NSIdentifier">name</string> - <double key="NSWidth">1.390000e+02</double> + <double key="NSWidth">1.410000e+02</double> <double key="NSMinWidth">2.000000e+01</double> <double key="NSMaxWidth">1.000000e+04</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> @@ -573,7 +573,7 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> <int key="NSTableViewSelectionHighlightStyle">1</int> </object> </object> - <string key="NSFrame">{{1, 1}, {142, 592}}</string> + <string key="NSFrameSize">{144, 594}</string> <reference key="NSSuperview" ref="251317961"/> <reference key="NSNextKeyView" ref="580246752"/> <reference key="NSDocView" ref="580246752"/> @@ -603,7 +603,7 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> <string key="NSFrameSize">{144, 594}</string> <reference key="NSSuperview" ref="8907081"/> <reference key="NSNextKeyView" ref="764939157"/> - <int key="NSsFlags">530</int> + <int key="NSsFlags">528</int> <reference key="NSVScroller" ref="865256551"/> <reference key="NSHScroller" ref="752357220"/> <reference key="NSContentView" ref="764939157"/> @@ -622,13 +622,13 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> <object class="NSOutlineView" id="105944579"> <reference key="NSNextResponder" ref="416243018"/> <int key="NSvFlags">256</int> - <string key="NSFrameSize">{543, 576}</string> + <string key="NSFrameSize">{545, 577}</string> <reference key="NSSuperview" ref="416243018"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="833839723"> <reference key="NSNextResponder" ref="682782591"/> <int key="NSvFlags">256</int> - <string key="NSFrameSize">{543, 17}</string> + <string key="NSFrameSize">{545, 17}</string> <reference key="NSSuperview" ref="682782591"/> <reference key="NSTableView" ref="105944579"/> </object> @@ -642,7 +642,7 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn" id="502561775"> <string key="NSIdentifier">title</string> - <double key="NSWidth">3.210000e+02</double> + <double key="NSWidth">3.230000e+02</double> <double key="NSMinWidth">1.600000e+01</double> <double key="NSMaxWidth">1.000000e+03</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> @@ -685,7 +685,7 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> </object> <object class="NSTextFieldCell" key="NSDataCell" id="294074504"> <int key="NSCellFlags">337772096</int> - <int key="NSCellFlags2">133120</int> + <int key="NSCellFlags2">133632</int> <string key="NSContents">Text Cell</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="105944579"/> @@ -714,7 +714,7 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> <bool key="NSAllowsTypeSelect">YES</bool> </object> </object> - <string key="NSFrame">{{1, 17}, {543, 576}}</string> + <string key="NSFrame">{{0, 17}, {545, 577}}</string> <reference key="NSSuperview" ref="111232465"/> <reference key="NSNextKeyView" ref="105944579"/> <reference key="NSDocView" ref="105944579"/> @@ -748,7 +748,7 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="833839723"/> </object> - <string key="NSFrame">{{1, 0}, {543, 17}}</string> + <string key="NSFrameSize">{545, 17}</string> <reference key="NSSuperview" ref="111232465"/> <reference key="NSNextKeyView" ref="833839723"/> <reference key="NSDocView" ref="833839723"/> @@ -760,7 +760,7 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> <string key="NSFrame">{{145, 0}, {545, 594}}</string> <reference key="NSSuperview" ref="8907081"/> <reference key="NSNextKeyView" ref="416243018"/> - <int key="NSsFlags">530</int> + <int key="NSsFlags">528</int> <reference key="NSVScroller" ref="585875894"/> <reference key="NSHScroller" ref="1062246906"/> <reference key="NSContentView" ref="416243018"/> @@ -1501,13 +1501,11 @@ cHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>group_</string> <string>manager_</string> <string>outline_</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> <string>BookmarkManagerController</string> <string>NSOutlineView</string> </object> |