summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/nibs/Preferences.xib114
-rw-r--r--chrome/browser/cocoa/preferences_window_controller.h1
-rw-r--r--chrome/browser/cocoa/preferences_window_controller.mm18
3 files changed, 108 insertions, 25 deletions
diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib
index 9800b61..d4877a7 100644
--- a/chrome/app/nibs/Preferences.xib
+++ b/chrome/app/nibs/Preferences.xib
@@ -3,14 +3,14 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9L31a</string>
- <string key="IBDocument.InterfaceBuilderVersion">680</string>
+ <string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="481"/>
- <integer value="74"/>
<integer value="482"/>
+ <integer value="74"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -165,7 +165,7 @@
<object class="NSButton" id="602116533">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">265</int>
- <string key="NSFrame">{{356, 297}, {73, 32}}</string>
+ <string key="NSFrame">{{356, 317}, {73, 32}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="82310084">
@@ -189,7 +189,7 @@
<object class="NSTextField" id="1032231978">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 586}, {447, 17}}</string>
+ <string key="NSFrame">{{17, 606}, {447, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="710610494">
@@ -226,7 +226,7 @@
<object class="NSTextField" id="287656702">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{17, 172}, {409, 17}}</string>
+ <string key="NSFrame">{{17, 192}, {409, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="237538019">
@@ -242,7 +242,7 @@
<object class="NSTextField" id="412658410">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{29, 242}, {397, 17}}</string>
+ <string key="NSFrame">{{29, 262}, {397, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="786981193">
@@ -262,7 +262,7 @@
<object class="NSTextField" id="1043699198">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{29, 509}, {397, 17}}</string>
+ <string key="NSFrame">{{29, 529}, {397, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="494850700">
@@ -278,7 +278,7 @@
<object class="NSButton" id="348105916">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{38, 201}, {158, 32}}</string>
+ <string key="NSFrame">{{38, 221}, {158, 32}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1018797611">
@@ -298,7 +298,7 @@
<object class="NSButton" id="480577047">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{30, 449}, {395, 18}}</string>
+ <string key="NSFrame">{{30, 469}, {395, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="298042898">
@@ -325,7 +325,7 @@
<object class="NSButton" id="808321623">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{30, 429}, {395, 18}}</string>
+ <string key="NSFrame">{{30, 449}, {395, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="874031585">
@@ -347,7 +347,7 @@
<object class="NSButton" id="139965100">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{30, 409}, {395, 18}}</string>
+ <string key="NSFrame">{{30, 429}, {395, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="647261577">
@@ -405,7 +405,7 @@
<object class="NSButton" id="217654608">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{30, 389}, {395, 18}}</string>
+ <string key="NSFrame">{{30, 409}, {395, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="935362863">
@@ -465,7 +465,7 @@
<object class="NSTextField" id="630848197">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 334}, {447, 17}}</string>
+ <string key="NSFrame">{{17, 354}, {447, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="660352048">
@@ -490,7 +490,7 @@
<string>NSFilenamesPboardType</string>
</object>
</object>
- <string key="NSFrame">{{25, 307}, {329, 17}}</string>
+ <string key="NSFrame">{{25, 327}, {329, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPathCell" key="NSCell" id="25958950">
@@ -511,7 +511,7 @@
<object class="NSButton" id="928184762">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{42, 279}, {383, 18}}</string>
+ <string key="NSFrame">{{42, 299}, {383, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="731161158">
@@ -553,7 +553,7 @@
<object class="NSButton" id="346222444">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{30, 369}, {395, 18}}</string>
+ <string key="NSFrame">{{30, 389}, {395, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="209704674">
@@ -575,7 +575,7 @@
<object class="NSButton" id="732733616">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{29, 487}, {96, 16}}</string>
+ <string key="NSFrame">{{29, 507}, {96, 16}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="21803731">
@@ -595,7 +595,7 @@
<object class="NSButton" id="553918619">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{228, 538}, {150, 32}}</string>
+ <string key="NSFrame">{{228, 558}, {150, 32}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="871001089">
@@ -615,7 +615,7 @@
<object class="NSButton" id="246942000">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{26, 538}, {202, 32}}</string>
+ <string key="NSFrame">{{26, 558}, {202, 32}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="42833123">
@@ -632,8 +632,30 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
+ <object class="NSButton" id="332489843">
+ <reference key="NSNextResponder" ref="1016273328"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{30, 168}, {383, 18}}</string>
+ <reference key="NSSuperview" ref="1016273328"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="1008555633">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">^IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE</string>
+ <reference key="NSSupport" ref="445696277"/>
+ <reference key="NSControlView" ref="332489843"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">130</int>
+ <reference key="NSNormalImage" ref="124073107"/>
+ <reference key="NSAlternateImage" ref="927168675"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
</object>
- <string key="NSFrameSize">{443, 623}</string>
+ <string key="NSFrameSize">{443, 643}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
@@ -3594,6 +3616,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">641</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: translateEnabled</string>
+ <reference key="source" ref="332489843"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="332489843"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">value: translateEnabled</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">translateEnabled</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">646</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -3662,13 +3700,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="484273049"/>
<reference ref="928184762"/>
<reference ref="287656702"/>
- <reference ref="777041502"/>
+ <reference ref="246942000"/>
+ <reference ref="553918619"/>
+ <reference ref="332489843"/>
<reference ref="514356928"/>
<reference ref="860741341"/>
<reference ref="886068350"/>
<reference ref="733677494"/>
- <reference ref="246942000"/>
- <reference ref="553918619"/>
+ <reference ref="777041502"/>
</object>
<reference key="parent" ref="956860932"/>
<string key="objectName">Under the Hood Content</string>
@@ -4774,6 +4813,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="42833123"/>
<reference key="parent" ref="246942000"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">642</int>
+ <reference key="object" ref="332489843"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1008555633"/>
+ </object>
+ <reference key="parent" ref="1016273328"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">643</int>
+ <reference key="object" ref="1008555633"/>
+ <reference key="parent" ref="332489843"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -4938,6 +4991,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>634.IBPluginDependency</string>
<string>635.IBPluginDependency</string>
<string>64.IBPluginDependency</string>
+ <string>642.IBPluginDependency</string>
+ <string>643.IBPluginDependency</string>
<string>65.IBPluginDependency</string>
<string>66.IBPluginDependency</string>
<string>67.IBPluginDependency</string>
@@ -5131,7 +5186,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{367, 295}, {443, 623}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{432, 838}, {443, 643}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5171,7 +5228,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">641</int>
+ <int key="maxID">646</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5307,6 +5364,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">NSWindow</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/themed_window.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">PreferencesWindowController</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="actions">
diff --git a/chrome/browser/cocoa/preferences_window_controller.h b/chrome/browser/cocoa/preferences_window_controller.h
index 1768fce..b064d87 100644
--- a/chrome/browser/cocoa/preferences_window_controller.h
+++ b/chrome/browser/cocoa/preferences_window_controller.h
@@ -105,6 +105,7 @@ class ProfileSyncService;
IBOutlet NSButton* downloadLocationButton_;
StringPrefMember defaultDownloadLocation_;
BooleanPrefMember askForSaveLocation_;
+ BooleanPrefMember translateEnabled_;
FontLanguageSettingsController* fontLanguageSettings_;
StringPrefMember currentTheme_;
IBOutlet NSButton* enableLoggingCheckbox_;
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index f380661..5cce358 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -390,6 +390,7 @@ CGFloat AutoSizeUnderTheHoodContent(NSView* view,
- (void)setSafeBrowsing:(BOOL)value;
- (void)setMetricsRecording:(BOOL)value;
- (void)setAskForSaveLocation:(BOOL)value;
+- (void)setTranslateEnabled:(BOOL)value;
- (void)displayPreferenceViewForPage:(OptionsPage)page
animate:(BOOL)animate;
@end
@@ -818,6 +819,7 @@ void PersonalDataManagerObserver::ShowAutoFillDialog(
useSuggest_.Init(prefs::kSearchSuggestEnabled, prefs_, observer_.get());
dnsPrefetch_.Init(prefs::kDnsPrefetchingEnabled, prefs_, observer_.get());
safeBrowsing_.Init(prefs::kSafeBrowsingEnabled, prefs_, observer_.get());
+ translateEnabled_.Init(prefs::kEnableTranslate, prefs_, observer_.get());
// During unit tests, there is no local state object, so we fall back to
// the prefs object (where we've explicitly registered this pref so we
@@ -1426,6 +1428,9 @@ const int kDisabledIndex = 1;
else if (*prefName == prefs::kPromptForDownload) {
[self setAskForSaveLocation:askForSaveLocation_.GetValue() ? YES : NO];
}
+ else if (*prefName == prefs::kEnableTranslate) {
+ [self setTranslateEnabled:translateEnabled_.GetValue() ? YES : NO];
+ }
}
// Set the new download path and notify the UI via KVO.
@@ -1609,6 +1614,19 @@ const int kDisabledIndex = 1;
askForSaveLocation_.SetValue(value);
}
+- (BOOL)translateEnabled {
+ return translateEnabled_.GetValue();
+}
+
+- (void)setTranslateEnabled:(BOOL)value {
+ if (value) {
+ [self recordUserAction:"Options_Translate_Enable"];
+ } else {
+ [self recordUserAction:"Options_Translate_Disable"];
+ }
+ translateEnabled_.SetValue(value);
+}
+
- (void)fontAndLanguageEndSheet:(NSWindow*)sheet
returnCode:(NSInteger)returnCode
contextInfo:(void*)context {
generated by cgit v1.1 at 2025-02-09 02:20:46 +0000