diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 09:59:37 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 09:59:37 +0000 |
| commit | 1677229632b3e4410030e280f637c7d7d5c5ca31 (patch) | |
| tree | 12b0745fc6b81c25f9efc4a0b7269090dad8b763 /chrome/browser/cocoa/preferences_window_controller.mm | |
| parent | 10f9436f16c972adaee0e4d9f8e4fe40a91de843 (diff) | |
| download | chromium_src-1677229632b3e4410030e280f637c7d7d5c5ca31.zip chromium_src-1677229632b3e4410030e280f637c7d7d5c5ca31.tar.gz chromium_src-1677229632b3e4410030e280f637c7d7d5c5ca31.tar.bz2 | |
Enable "Import Settings" button in preferences dialog.
BUG=29819
TEST=Open settings dialog, go to "Personal Stuff" Tab, Import Data... button should function
Review URL: http://codereview.chromium.org/555065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37101 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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index c4ad9ac..19ad0f2 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -19,6 +19,7 @@ #import "chrome/browser/cocoa/cookies_window_controller.h" #import "chrome/browser/cocoa/custom_home_pages_model.h" #import "chrome/browser/cocoa/font_language_settings_controller.h" +#import "chrome/browser/cocoa/import_settings_dialog.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" @@ -1150,7 +1151,12 @@ const int kDisabledIndex = 1; // Called to import data from other browsers (Safari, Firefox, etc). - (IBAction)importData:(id)sender { - NOTIMPLEMENTED(); + UserMetrics::RecordAction("Import_ShowDlg", profile_); + + // Note that the dialog controller takes care of cleaning itself up + // upon dismissal so auto-scoping here is not necessary. + [[[ImportSettingsDialogController alloc] + initWithProfile:profile_ parentWindow:nil] runModalDialog]; } // Called to clear user's browsing data. This puts up an application-modal |