| 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/ui/cocoa/preferences_window_controller.h" | 5 #import "chrome/browser/ui/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 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1252 // label. | 1252 // label. |
| 1253 - (void)configureInstant { | 1253 - (void)configureInstant { |
| 1254 bool enabled = instantEnabled_.GetValue(); | 1254 bool enabled = instantEnabled_.GetValue(); |
| 1255 NSInteger state = enabled ? NSOnState : NSOffState; | 1255 NSInteger state = enabled ? NSOnState : NSOffState; |
| 1256 [instantCheckbox_ setState:state]; | 1256 [instantCheckbox_ setState:state]; |
| 1257 | 1257 |
| 1258 [instantExperiment_ setStringValue:@""]; | 1258 [instantExperiment_ setStringValue:@""]; |
| 1259 } | 1259 } |
| 1260 | 1260 |
| 1261 - (IBAction)learnMoreAboutInstant:(id)sender { | 1261 - (IBAction)learnMoreAboutInstant:(id)sender { |
| 1262 browser::ShowOptionsURL(profile_, GURL(browser::kInstantLearnMoreURL)); | 1262 browser::ShowOptionsURL(profile_, browser::InstantLearnMoreURL()); |
| 1263 } | 1263 } |
| 1264 | 1264 |
| 1265 // Called when the user clicks the button to make Chromium the default | 1265 // Called when the user clicks the button to make Chromium the default |
| 1266 // browser. Registers http and https. | 1266 // browser. Registers http and https. |
| 1267 - (IBAction)makeDefaultBrowser:(id)sender { | 1267 - (IBAction)makeDefaultBrowser:(id)sender { |
| 1268 [self willChangeValueForKey:@"defaultBrowser"]; | 1268 [self willChangeValueForKey:@"defaultBrowser"]; |
| 1269 | 1269 |
| 1270 ShellIntegration::SetAsDefaultBrowser(); | 1270 ShellIntegration::SetAsDefaultBrowser(); |
| 1271 [self recordUserAction:UserMetricsAction("Options_SetAsDefaultBrowser")]; | 1271 [self recordUserAction:UserMetricsAction("Options_SetAsDefaultBrowser")]; |
| 1272 // If the user made Chrome the default browser, then he/she arguably wants | 1272 // If the user made Chrome the default browser, then he/she arguably wants |
| (...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2175 case OPTIONS_PAGE_ADVANCED: | 2175 case OPTIONS_PAGE_ADVANCED: |
| 2176 return underTheHoodView_; | 2176 return underTheHoodView_; |
| 2177 case OPTIONS_PAGE_DEFAULT: | 2177 case OPTIONS_PAGE_DEFAULT: |
| 2178 case OPTIONS_PAGE_COUNT: | 2178 case OPTIONS_PAGE_COUNT: |
| 2179 LOG(DFATAL) << "Invalid page value " << page; | 2179 LOG(DFATAL) << "Invalid page value " << page; |
| 2180 } | 2180 } |
| 2181 return basicsView_; | 2181 return basicsView_; |
| 2182 } | 2182 } |
| 2183 | 2183 |
| 2184 @end | 2184 @end |
| OLD | NEW |