| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/cocoa/options/preferences_window_controller.h" | 5 #import "chrome/browser/ui/cocoa/options/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 1411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1422 browser->OpenPrivacyDashboardTabAndActivate(); | 1422 browser->OpenPrivacyDashboardTabAndActivate(); |
| 1423 } | 1423 } |
| 1424 | 1424 |
| 1425 // Called when the user clicks the "Customize Sync" button in the | 1425 // Called when the user clicks the "Customize Sync" button in the |
| 1426 // "Personal Stuff" pane. Spawns a dialog-modal sheet that cleans | 1426 // "Personal Stuff" pane. Spawns a dialog-modal sheet that cleans |
| 1427 // itself up on close. | 1427 // itself up on close. |
| 1428 - (IBAction)doSyncCustomize:(id)sender { | 1428 - (IBAction)doSyncCustomize:(id)sender { |
| 1429 syncService_->ShowConfigure(NULL); | 1429 syncService_->ShowConfigure(NULL); |
| 1430 } | 1430 } |
| 1431 | 1431 |
| 1432 // Called when the user clicks on the multi-purpose 'sync problem' |
| 1433 // link. |
| 1432 - (IBAction)doSyncReauthentication:(id)sender { | 1434 - (IBAction)doSyncReauthentication:(id)sender { |
| 1433 DCHECK(syncService_ && !syncService_->IsManaged()); | 1435 DCHECK(syncService_ && !syncService_->IsManaged()); |
| 1434 syncService_->ShowLoginDialog(NULL); | 1436 syncService_->ShowErrorUI(NULL); |
| 1435 } | 1437 } |
| 1436 | 1438 |
| 1437 - (void)setPasswordManagerEnabledIndex:(NSInteger)value { | 1439 - (void)setPasswordManagerEnabledIndex:(NSInteger)value { |
| 1438 if (value == kEnabledIndex) | 1440 if (value == kEnabledIndex) |
| 1439 [self recordUserAction:UserMetricsAction( | 1441 [self recordUserAction:UserMetricsAction( |
| 1440 "Options_PasswordManager_Enable")]; | 1442 "Options_PasswordManager_Enable")]; |
| 1441 else | 1443 else |
| 1442 [self recordUserAction:UserMetricsAction( | 1444 [self recordUserAction:UserMetricsAction( |
| 1443 "Options_PasswordManager_Disable")]; | 1445 "Options_PasswordManager_Disable")]; |
| 1444 askSavePasswords_.SetValueIfNotManaged(value == kEnabledIndex ? true : false); | 1446 askSavePasswords_.SetValueIfNotManaged(value == kEnabledIndex ? true : false); |
| (...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2162 case OPTIONS_PAGE_ADVANCED: | 2164 case OPTIONS_PAGE_ADVANCED: |
| 2163 return underTheHoodView_; | 2165 return underTheHoodView_; |
| 2164 case OPTIONS_PAGE_DEFAULT: | 2166 case OPTIONS_PAGE_DEFAULT: |
| 2165 case OPTIONS_PAGE_COUNT: | 2167 case OPTIONS_PAGE_COUNT: |
| 2166 LOG(DFATAL) << "Invalid page value " << page; | 2168 LOG(DFATAL) << "Invalid page value " << page; |
| 2167 } | 2169 } |
| 2168 return basicsView_; | 2170 return basicsView_; |
| 2169 } | 2171 } |
| 2170 | 2172 |
| 2171 @end | 2173 @end |
| OLD | NEW |