Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Side by Side Diff: chrome/browser/cocoa/preferences_window_controller.mm

Issue 2799054: Remove the AutoFill enable/disable radio from the Options dialog to the AutoFill dialog (Closed)
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/cocoa/preferences_window_controller.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/cocoa/preferences_window_controller.h" 5 #import "chrome/browser/cocoa/preferences_window_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/l10n_util_mac.h" 10 #include "app/l10n_util_mac.h"
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 - (void)unregisterPrefObservers; 338 - (void)unregisterPrefObservers;
339 339
340 - (void)customHomePagesChanged; 340 - (void)customHomePagesChanged;
341 341
342 // KVC setter methods. 342 // KVC setter methods.
343 - (void)setNewTabPageIsHomePageIndex:(NSInteger)val; 343 - (void)setNewTabPageIsHomePageIndex:(NSInteger)val;
344 - (void)setHomepageURL:(NSString*)urlString; 344 - (void)setHomepageURL:(NSString*)urlString;
345 - (void)setRestoreOnStartupIndex:(NSInteger)type; 345 - (void)setRestoreOnStartupIndex:(NSInteger)type;
346 - (void)setShowHomeButton:(BOOL)value; 346 - (void)setShowHomeButton:(BOOL)value;
347 - (void)setPasswordManagerEnabledIndex:(NSInteger)value; 347 - (void)setPasswordManagerEnabledIndex:(NSInteger)value;
348 - (void)setFormAutofillEnabledIndex:(NSInteger)value;
349 - (void)setIsUsingDefaultTheme:(BOOL)value; 348 - (void)setIsUsingDefaultTheme:(BOOL)value;
350 - (void)setShowAlternateErrorPages:(BOOL)value; 349 - (void)setShowAlternateErrorPages:(BOOL)value;
351 - (void)setUseSuggest:(BOOL)value; 350 - (void)setUseSuggest:(BOOL)value;
352 - (void)setDnsPrefetch:(BOOL)value; 351 - (void)setDnsPrefetch:(BOOL)value;
353 - (void)setSafeBrowsing:(BOOL)value; 352 - (void)setSafeBrowsing:(BOOL)value;
354 - (void)setMetricsRecording:(BOOL)value; 353 - (void)setMetricsRecording:(BOOL)value;
355 - (void)setAskForSaveLocation:(BOOL)value; 354 - (void)setAskForSaveLocation:(BOOL)value;
356 - (void)setFileHandlerUIEnabled:(BOOL)value; 355 - (void)setFileHandlerUIEnabled:(BOOL)value;
357 - (void)setTranslateEnabled:(BOOL)value; 356 - (void)setTranslateEnabled:(BOOL)value;
358 - (void)setTabsToLinks:(BOOL)value; 357 - (void)setTabsToLinks:(BOOL)value;
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 prefs_->AddPrefObserver(prefs::kURLsToRestoreOnStartup, observer_.get()); 781 prefs_->AddPrefObserver(prefs::kURLsToRestoreOnStartup, observer_.get());
783 restoreOnStartup_.Init(prefs::kRestoreOnStartup, prefs_, observer_.get()); 782 restoreOnStartup_.Init(prefs::kRestoreOnStartup, prefs_, observer_.get());
784 newTabPageIsHomePage_.Init(prefs::kHomePageIsNewTabPage, 783 newTabPageIsHomePage_.Init(prefs::kHomePageIsNewTabPage,
785 prefs_, observer_.get()); 784 prefs_, observer_.get());
786 homepage_.Init(prefs::kHomePage, prefs_, observer_.get()); 785 homepage_.Init(prefs::kHomePage, prefs_, observer_.get());
787 showHomeButton_.Init(prefs::kShowHomeButton, prefs_, observer_.get()); 786 showHomeButton_.Init(prefs::kShowHomeButton, prefs_, observer_.get());
788 787
789 // Personal Stuff panel 788 // Personal Stuff panel
790 askSavePasswords_.Init(prefs::kPasswordManagerEnabled, 789 askSavePasswords_.Init(prefs::kPasswordManagerEnabled,
791 prefs_, observer_.get()); 790 prefs_, observer_.get());
792 formAutofill_.Init(prefs::kAutoFillEnabled, prefs_, observer_.get());
793 currentTheme_.Init(prefs::kCurrentThemeID, prefs_, observer_.get()); 791 currentTheme_.Init(prefs::kCurrentThemeID, prefs_, observer_.get());
794 792
795 // Under the hood panel 793 // Under the hood panel
796 alternateErrorPages_.Init(prefs::kAlternateErrorPagesEnabled, 794 alternateErrorPages_.Init(prefs::kAlternateErrorPagesEnabled,
797 prefs_, observer_.get()); 795 prefs_, observer_.get());
798 useSuggest_.Init(prefs::kSearchSuggestEnabled, prefs_, observer_.get()); 796 useSuggest_.Init(prefs::kSearchSuggestEnabled, prefs_, observer_.get());
799 dnsPrefetch_.Init(prefs::kDnsPrefetchingEnabled, prefs_, observer_.get()); 797 dnsPrefetch_.Init(prefs::kDnsPrefetchingEnabled, prefs_, observer_.get());
800 safeBrowsing_.Init(prefs::kSafeBrowsingEnabled, prefs_, observer_.get()); 798 safeBrowsing_.Init(prefs::kSafeBrowsingEnabled, prefs_, observer_.get());
801 autoOpenFiles_.Init( 799 autoOpenFiles_.Init(
802 prefs::kDownloadExtensionsToOpen, prefs_, observer_.get()); 800 prefs::kDownloadExtensionsToOpen, prefs_, observer_.get());
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 1225
1228 // Callback when preferences are changed. |prefName| is the name of the pref 1226 // Callback when preferences are changed. |prefName| is the name of the pref
1229 // that has changed. Unlike on Windows, we don't need to use this method for 1227 // that has changed. Unlike on Windows, we don't need to use this method for
1230 // initializing, that's handled by Cocoa Bindings. 1228 // initializing, that's handled by Cocoa Bindings.
1231 // Handles prefs for the "Personal Stuff" panel. 1229 // Handles prefs for the "Personal Stuff" panel.
1232 - (void)userDataPrefChanged:(std::wstring*)prefName { 1230 - (void)userDataPrefChanged:(std::wstring*)prefName {
1233 if (*prefName == prefs::kPasswordManagerEnabled) { 1231 if (*prefName == prefs::kPasswordManagerEnabled) {
1234 [self setPasswordManagerEnabledIndex:askSavePasswords_.GetValue() ? 1232 [self setPasswordManagerEnabledIndex:askSavePasswords_.GetValue() ?
1235 kEnabledIndex : kDisabledIndex]; 1233 kEnabledIndex : kDisabledIndex];
1236 } 1234 }
1237 if (*prefName == prefs::kAutoFillEnabled) {
1238 [self setFormAutofillEnabledIndex:formAutofill_.GetValue() ?
1239 kEnabledIndex : kDisabledIndex];
1240 }
1241 if (*prefName == prefs::kCurrentThemeID) { 1235 if (*prefName == prefs::kCurrentThemeID) {
1242 [self setIsUsingDefaultTheme:currentTheme_.GetValue().length() == 0]; 1236 [self setIsUsingDefaultTheme:currentTheme_.GetValue().length() == 0];
1243 } 1237 }
1244 } 1238 }
1245 1239
1246 // Called to launch the Keychain Access app to show the user's stored 1240 // Called to launch the Keychain Access app to show the user's stored
1247 // passwords. 1241 // passwords.
1248 - (IBAction)showSavedPasswords:(id)sender { 1242 - (IBAction)showSavedPasswords:(id)sender {
1249 [self recordUserAction:UserMetricsAction("Options_ShowPasswordsExceptions")]; 1243 [self recordUserAction:UserMetricsAction("Options_ShowPasswordsExceptions")];
1250 [self launchKeychainAccess]; 1244 [self launchKeychainAccess];
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
1350 else 1344 else
1351 [self recordUserAction:UserMetricsAction( 1345 [self recordUserAction:UserMetricsAction(
1352 "Options_PasswordManager_Disable")]; 1346 "Options_PasswordManager_Disable")];
1353 askSavePasswords_.SetValue(value == kEnabledIndex ? true : false); 1347 askSavePasswords_.SetValue(value == kEnabledIndex ? true : false);
1354 } 1348 }
1355 1349
1356 - (NSInteger)passwordManagerEnabledIndex { 1350 - (NSInteger)passwordManagerEnabledIndex {
1357 return askSavePasswords_.GetValue() ? kEnabledIndex : kDisabledIndex; 1351 return askSavePasswords_.GetValue() ? kEnabledIndex : kDisabledIndex;
1358 } 1352 }
1359 1353
1360 - (void)setFormAutofillEnabledIndex:(NSInteger)value {
1361 if (value == kEnabledIndex)
1362 [self recordUserAction:UserMetricsAction("Options_FormAutofill_Enable")];
1363 else
1364 [self recordUserAction:UserMetricsAction("Options_FormAutofill_Disable")];
1365 formAutofill_.SetValue(value == kEnabledIndex ? true : false);
1366 }
1367
1368 - (NSInteger)formAutofillEnabledIndex {
1369 return formAutofill_.GetValue() ? kEnabledIndex : kDisabledIndex;
1370 }
1371
1372 - (void)setIsUsingDefaultTheme:(BOOL)value { 1354 - (void)setIsUsingDefaultTheme:(BOOL)value {
1373 if (value) 1355 if (value)
1374 [self recordUserAction:UserMetricsAction( 1356 [self recordUserAction:UserMetricsAction(
1375 "Options_IsUsingDefaultTheme_Enable")]; 1357 "Options_IsUsingDefaultTheme_Enable")];
1376 else 1358 else
1377 [self recordUserAction:UserMetricsAction( 1359 [self recordUserAction:UserMetricsAction(
1378 "Options_IsUsingDefaultTheme_Disable")]; 1360 "Options_IsUsingDefaultTheme_Disable")];
1379 } 1361 }
1380 1362
1381 - (BOOL)isUsingDefaultTheme { 1363 - (BOOL)isUsingDefaultTheme {
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
2088 case OPTIONS_PAGE_ADVANCED: 2070 case OPTIONS_PAGE_ADVANCED:
2089 return underTheHoodView_; 2071 return underTheHoodView_;
2090 case OPTIONS_PAGE_DEFAULT: 2072 case OPTIONS_PAGE_DEFAULT:
2091 case OPTIONS_PAGE_COUNT: 2073 case OPTIONS_PAGE_COUNT:
2092 LOG(DFATAL) << "Invalid page value " << page; 2074 LOG(DFATAL) << "Invalid page value " << page;
2093 } 2075 }
2094 return basicsView_; 2076 return basicsView_;
2095 } 2077 }
2096 2078
2097 @end 2079 @end
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/preferences_window_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698