| OLD | NEW |
| 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 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1198 [self recordUserAction:UserMetricsAction("Options_ShowAutoFillSettings")]; | 1198 [self recordUserAction:UserMetricsAction("Options_ShowAutoFillSettings")]; |
| 1199 | 1199 |
| 1200 PersonalDataManager* personalDataManager = profile_->GetPersonalDataManager(); | 1200 PersonalDataManager* personalDataManager = profile_->GetPersonalDataManager(); |
| 1201 if (!personalDataManager) { | 1201 if (!personalDataManager) { |
| 1202 // Should not reach here because button is disabled when | 1202 // Should not reach here because button is disabled when |
| 1203 // |personalDataManager| is NULL. | 1203 // |personalDataManager| is NULL. |
| 1204 NOTREACHED(); | 1204 NOTREACHED(); |
| 1205 return; | 1205 return; |
| 1206 } | 1206 } |
| 1207 | 1207 |
| 1208 ShowAutoFillDialog(NULL, personalDataManager, profile_, NULL, NULL); | 1208 ShowAutoFillDialog(NULL, personalDataManager, profile_); |
| 1209 } | 1209 } |
| 1210 | 1210 |
| 1211 // Called to import data from other browsers (Safari, Firefox, etc). | 1211 // Called to import data from other browsers (Safari, Firefox, etc). |
| 1212 - (IBAction)importData:(id)sender { | 1212 - (IBAction)importData:(id)sender { |
| 1213 UserMetrics::RecordAction(UserMetricsAction("Import_ShowDlg"), profile_); | 1213 UserMetrics::RecordAction(UserMetricsAction("Import_ShowDlg"), profile_); |
| 1214 [ImportSettingsDialogController showImportSettingsDialogForProfile:profile_]; | 1214 [ImportSettingsDialogController showImportSettingsDialogForProfile:profile_]; |
| 1215 } | 1215 } |
| 1216 | 1216 |
| 1217 - (IBAction)resetThemeToDefault:(id)sender { | 1217 - (IBAction)resetThemeToDefault:(id)sender { |
| 1218 [self recordUserAction:UserMetricsAction("Options_ThemesReset")]; | 1218 [self recordUserAction:UserMetricsAction("Options_ThemesReset")]; |
| (...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2019 case OPTIONS_PAGE_ADVANCED: | 2019 case OPTIONS_PAGE_ADVANCED: |
| 2020 return underTheHoodView_; | 2020 return underTheHoodView_; |
| 2021 case OPTIONS_PAGE_DEFAULT: | 2021 case OPTIONS_PAGE_DEFAULT: |
| 2022 case OPTIONS_PAGE_COUNT: | 2022 case OPTIONS_PAGE_COUNT: |
| 2023 LOG(DFATAL) << "Invalid page value " << page; | 2023 LOG(DFATAL) << "Invalid page value " << page; |
| 2024 } | 2024 } |
| 2025 return basicsView_; | 2025 return basicsView_; |
| 2026 } | 2026 } |
| 2027 | 2027 |
| 2028 @end | 2028 @end |
| OLD | NEW |