diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 17:50:53 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 17:50:53 +0000 |
| commit | 2bcec61a43b8b7ed7b9b0e96b68f5ed42110081a (patch) | |
| tree | 957d756c489075bd18a8e09e5ee38c8a8e769ab8 /chrome/app | |
| parent | d0bc15b44084f5860456ef9beac1f64bcfaf0eaf (diff) | |
| download | chromium_src-2bcec61a43b8b7ed7b9b0e96b68f5ed42110081a.zip chromium_src-2bcec61a43b8b7ed7b9b0e96b68f5ed42110081a.tar.gz chromium_src-2bcec61a43b8b7ed7b9b0e96b68f5ed42110081a.tar.bz2 | |
Implement OS X Encoding Menu.
Also refactor Windows Encoding menu a bit to make the moving parts x-platform.
Add a unit test for the menu encoding logic.
In a followup CL I'll add some UI tests around this.
Review URL: http://codereview.chromium.org/113315
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_resource.h | 4 | ||||
| -rw-r--r-- | chrome/app/nibs/en.lproj/MainMenu.xib | 34 |
2 files changed, 17 insertions, 21 deletions
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h index f8275e7..0854823 100644 --- a/chrome/app/chrome_dll_resource.h +++ b/chrome/app/chrome_dll_resource.h @@ -90,6 +90,10 @@ #define IDC_PRINT 35003 #define IDC_SAVE_PAGE 35004 #define IDC_ENCODING_MENU 35005 + +// When adding a new encoding to this list, be sure to append it to the +// EncodingMenuController::kValidEncodingIds array in +// encoding_menu_controller.cc. #define IDC_ENCODING_AUTO_DETECT 35006 #define IDC_ENCODING_UTF8 35007 #define IDC_ENCODING_UTF16LE 35008 diff --git a/chrome/app/nibs/en.lproj/MainMenu.xib b/chrome/app/nibs/en.lproj/MainMenu.xib index 0b5b278..fdeec8bb 100644 --- a/chrome/app/nibs/en.lproj/MainMenu.xib +++ b/chrome/app/nibs/en.lproj/MainMenu.xib @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="502"/> + <integer value="465"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -795,14 +795,6 @@ <string key="NSTitle">Text Encoding</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="433074134"> - <reference key="NSMenu" ref="466817936"/> - <string type="base64-UTF8" key="NSTitle">VW5pY29kZeKEoiAoVVRGLTgpA</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="353210768"/> - <reference key="NSMixedImage" ref="549394948"/> - </object> </object> </object> </object> @@ -1580,6 +1572,14 @@ </object> <int key="connectionID">558</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="602502221"/> + </object> + <int key="connectionID">615</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -2234,16 +2234,10 @@ <reference key="object" ref="466817936"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="433074134"/> </object> <reference key="parent" ref="602502221"/> </object> <object class="IBObjectRecord"> - <int key="objectID">467</int> - <reference key="object" ref="433074134"/> - <reference key="parent" ref="466817936"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">473</int> <reference key="object" ref="299901009"/> <object class="NSMutableArray" key="children"> @@ -2598,7 +2592,6 @@ <string>465.IBPluginDependency</string> <string>466.IBEditorWindowLastContentRect</string> <string>466.IBPluginDependency</string> - <string>467.IBPluginDependency</string> <string>473.IBPluginDependency</string> <string>483.IBPluginDependency</string> <string>491.IBPluginDependency</string> @@ -2786,13 +2779,13 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{525, 802}, {197, 73}}</string> - <string>{{369, 836}, {535, 20}}</string> + <string>{{455, 721}, {535, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{74, 862}</string> <string>{{11, 977}, {478, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{561, 623}, {273, 213}}</string> + <string>{{647, 508}, {273, 213}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{475, 832}, {234, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2825,8 +2818,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{834, 643}, {178, 23}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{920, 545}, {64, 6}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2919,7 +2911,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">558</int> + <int key="maxID">615</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> |