summaryrefslogtreecommitdiffstats
path: root/chrome/app/nibs
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 13:32:21 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 13:32:21 +0000
commit92e1212fd2d33d4bf6489c51ae0d81e195ff3a5a (patch)
tree0a23a320e88bcc56175b164a5e0675f2702030a0 /chrome/app/nibs
parent04bbad202d07b9c32f47aa9332ef95d3686e68ef (diff)
downloadchromium_src-92e1212fd2d33d4bf6489c51ae0d81e195ff3a5a.zip
chromium_src-92e1212fd2d33d4bf6489c51ae0d81e195ff3a5a.tar.gz
chromium_src-92e1212fd2d33d4bf6489c51ae0d81e195ff3a5a.tar.bz2
ObjC classes generated by the build and used in Xib files is already getting ugly, if they aren't built at build start, IB sometimes throws warnings about unknown things, so...
- Use one class for the localizer and generate the table that drives it. - Update the generator script to process a list of xib files and generate one header. - Update the data within the GYP file to do this. - This might actually help overall size since it helps force one set of strings for each different window. - Switch to bsearch for table lookup since we have one, larger table now. TEST=none BUG=none Review URL: http://codereview.chromium.org/164260 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r--chrome/app/nibs/BookmarkBar.xib18
-rw-r--r--chrome/app/nibs/BookmarkEditor.xib10
-rw-r--r--chrome/app/nibs/BookmarkNameFolder.xib14
-rw-r--r--chrome/app/nibs/TabView.xib10
-rw-r--r--chrome/app/nibs/Toolbar.xib37
5 files changed, 45 insertions, 44 deletions
diff --git a/chrome/app/nibs/BookmarkBar.xib b/chrome/app/nibs/BookmarkBar.xib
index b8da664..2dc0c3d 100644
--- a/chrome/app/nibs/BookmarkBar.xib
+++ b/chrome/app/nibs/BookmarkBar.xib
@@ -8,9 +8,9 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
<integer value="18"/>
<integer value="4"/>
- <integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -303,7 +303,7 @@
</object>
</object>
<object class="NSCustomObject" id="849863465">
- <string key="NSClassName">BookmarkBarLocalizer</string>
+ <string key="NSClassName">ChromeUILocalizer</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -901,15 +901,17 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>buttonContextMenu_</string>
<string>buttonView_</string>
- <string>delegate_</string>
<string>offTheSideButton_</string>
+ <string>resizeDelegate_</string>
+ <string>urlDelegate_</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSMenu</string>
<string>NSView</string>
- <string>id</string>
<string>NSButton</string>
+ <string>id</string>
+ <string>id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -918,14 +920,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">BookmarkBarLocalizer</string>
- <string key="superclassName">ChromeUILocalizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../xcodebuild/chrome.build/DerivedSources/Debug/xib_localizers/bookmark_bar_localizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">ChromeUILocalizer</string>
<string key="superclassName">GTMUILocalizer</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/chrome/app/nibs/BookmarkEditor.xib b/chrome/app/nibs/BookmarkEditor.xib
index 0d03abc..85d005e 100644
--- a/chrome/app/nibs/BookmarkEditor.xib
+++ b/chrome/app/nibs/BookmarkEditor.xib
@@ -301,7 +301,7 @@
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
<object class="NSCustomObject" id="764065517">
- <string key="NSClassName">BookmarkEditorLocalizer</string>
+ <string key="NSClassName">ChromeUILocalizer</string>
</object>
<object class="NSCustomObject" id="12470901">
<string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string>
@@ -764,14 +764,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">BookmarkEditorLocalizer</string>
- <string key="superclassName">ChromeUILocalizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../xcodebuild/chrome.build/DerivedSources/Debug/xib_localizers/bookmark_editor_localizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">ChromeUILocalizer</string>
<string key="superclassName">GTMUILocalizer</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/chrome/app/nibs/BookmarkNameFolder.xib b/chrome/app/nibs/BookmarkNameFolder.xib
index 82b8da5..7271553 100644
--- a/chrome/app/nibs/BookmarkNameFolder.xib
+++ b/chrome/app/nibs/BookmarkNameFolder.xib
@@ -162,7 +162,7 @@
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
<object class="NSCustomObject" id="352865609">
- <string key="NSClassName">BookmarkNameFolderLocalizer</string>
+ <string key="NSClassName">ChromeUILocalizer</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -352,9 +352,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{816, 841}, {480, 102}}</string>
+ <string>{{688, 841}, {480, 102}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{816, 841}, {480, 102}}</string>
+ <string>{{688, 841}, {480, 102}}</string>
<boolean value="NO"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
@@ -421,14 +421,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">BookmarkNameFolderLocalizer</string>
- <string key="superclassName">ChromeUILocalizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../xcodebuild/chrome.build/DerivedSources/Debug/xib_localizers/bookmark_name_folder_localizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">ChromeUILocalizer</string>
<string key="superclassName">GTMUILocalizer</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/chrome/app/nibs/TabView.xib b/chrome/app/nibs/TabView.xib
index 0a80d73..e7e0950 100644
--- a/chrome/app/nibs/TabView.xib
+++ b/chrome/app/nibs/TabView.xib
@@ -271,7 +271,7 @@
</object>
</object>
<object class="NSCustomObject" id="208901833">
- <string key="NSClassName">TabViewLocalizer</string>
+ <string key="NSClassName">ChromeUILocalizer</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -848,14 +848,6 @@
<string key="minorKey">browser/cocoa/tab_view.h</string>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">TabViewLocalizer</string>
- <string key="superclassName">ChromeUILocalizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../xcodebuild/chrome.build/DerivedSources/Debug/xib_localizers/tab_view_localizer.h</string>
- </object>
- </object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
diff --git a/chrome/app/nibs/Toolbar.xib b/chrome/app/nibs/Toolbar.xib
index ad59b58..190add7 100644
--- a/chrome/app/nibs/Toolbar.xib
+++ b/chrome/app/nibs/Toolbar.xib
@@ -8,8 +8,8 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="88"/>
<integer value="4"/>
+ <integer value="88"/>
<integer value="102"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -673,7 +673,7 @@
</object>
</object>
<object class="NSCustomObject" id="1044322163">
- <string key="NSClassName">ToolbarLocalizer</string>
+ <string key="NSClassName">ChromeUILocalizer</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -1667,7 +1667,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{984, 816}, {306, 263}}</string>
+ <string>{{862, 816}, {306, 263}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1796,6 +1796,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">ChromeUILocalizer</string>
+ <string key="superclassName">GTMUILocalizer</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/ui_localizer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">ClickHoldButtonCell</string>
<string key="superclassName">GradientButtonCell</string>
<object class="NSMutableDictionary" key="outlets">
@@ -1828,6 +1836,29 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">GTMUILocalizer</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>otherObjectToLocalize_</string>
+ <string>owner_</string>
+ <string>yetAnotherObjectToLocalize_</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">GradientButtonCell</string>
<string key="superclassName">NSButtonCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
generated by cgit v1.1 at 2025-01-29 18:03:23 +0000