diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-07 16:30:57 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-07 16:30:57 +0000 |
| commit | 756989c7141327101d9ea67d7199c6ba2aec384c (patch) | |
| tree | 1c148ec319c149635eea7b43cd855d5ea0a3e1b6 /chrome/browser/cocoa/preferences_window_controller.mm | |
| parent | 2014cdc6254263ae5d79c567d020551e38e2f203 (diff) | |
| download | chromium_src-756989c7141327101d9ea67d7199c6ba2aec384c.zip chromium_src-756989c7141327101d9ea67d7199c6ba2aec384c.tar.gz chromium_src-756989c7141327101d9ea67d7199c6ba2aec384c.tar.bz2 | |
[Mac] Implement font and encoding settings in Under the Hood preferences
* Font settings can now be changed for serif, sans serif, and fixed width.
* The default encoding can now be changed via preferences.
* Language settings are not yet implemented. See http://crbug.com/23828
BUG=20845
TEST=Chromium-->Preferences-->Under the Hood-->Change font and language settings
Review URL: http://codereview.chromium.org/461005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/preferences_window_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.mm | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index dbedda9a..5e8d99b 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -17,6 +17,7 @@ #include "chrome/browser/browser_process.h" #import "chrome/browser/cocoa/clear_browsing_data_controller.h" #import "chrome/browser/cocoa/custom_home_pages_model.h" +#import "chrome/browser/cocoa/font_language_settings_controller.h" #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" #import "chrome/browser/cocoa/search_engine_list_model.h" #include "chrome/browser/extensions/extensions_service.h" @@ -1553,6 +1554,26 @@ const int kDisabledIndex = 1; askForSaveLocation_.SetValue(value); } +- (void)fontAndLanguageEndSheet:(NSWindow*)sheet + returnCode:(NSInteger)returnCode + contextInfo:(void*)context { + [sheet close]; + [sheet orderOut:self]; + fontLanguageSettings_ = nil; +} + +- (IBAction)changeFontAndLanguageSettings:(id)sender { + // Intentionally leak the controller as it will clean itself up when the + // sheet closes. + fontLanguageSettings_ = + [[FontLanguageSettingsController alloc] initWithProfile:profile_]; + [NSApp beginSheet:[fontLanguageSettings_ window] + modalForWindow:[self window] + modalDelegate:self + didEndSelector:@selector(fontAndLanguageEndSheet:returnCode:contextInfo:) + contextInfo:nil]; +} + //------------------------------------------------------------------------- // Callback when preferences are changed. |prefName| is the name of the |