diff options
author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 10:56:53 +0000 |
---|---|---|
committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 10:56:53 +0000 |
commit | 2989cce1dc13632ff584d265bd7cd16e72cc4c9f (patch) | |
tree | daaae538d7004b6b65e5ea8b63469922ff8d8a81 /chrome/browser/app_controller_mac.mm | |
parent | 7e0831b90c618af96931fcbd0908c4fd05ae0ec5 (diff) | |
download | chromium_src-2989cce1dc13632ff584d265bd7cd16e72cc4c9f.zip chromium_src-2989cce1dc13632ff584d265bd7cd16e72cc4c9f.tar.gz chromium_src-2989cce1dc13632ff584d265bd7cd16e72cc4c9f.tar.bz2 |
OS X: Import settings dialog cleanup.
* Make Import settings dialog app modal.
* No longer allow display of multiple dialogs at once.
* For some reason, unit test was present but missing from .gyp file - re-added and freshened up.
BUG=33011
TEST=selecting Chrome->Import Bookmarks and settings multiple times should only open bookmarks once.
Review URL: http://codereview.chromium.org/556097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
-rw-r--r-- | chrome/browser/app_controller_mac.mm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index e3ed47b..8895354 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -580,10 +580,8 @@ static bool g_is_opening_new_window = false; } case IDC_IMPORT_SETTINGS: { UserMetrics::RecordAction("Import_ShowDlg", defaultProfile); - // Note that this dialog controller cleans itself up when closed - // so auto-scoping it here is not necessary. - [[[ImportSettingsDialogController alloc] - initWithProfile:defaultProfile parentWindow:nil] runModalDialog]; + [ImportSettingsDialogController + showImportSettingsDialogForProfile:defaultProfile]; break; } case IDC_SHOW_BOOKMARK_MANAGER: |