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/cocoa/browser_window_cocoa.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/cocoa/browser_window_cocoa.mm')
| -rw-r--r-- | chrome/browser/cocoa/browser_window_cocoa.mm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index a9b6b2bf0..e5a20c9 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -294,10 +294,8 @@ void BrowserWindowCocoa::ShowClearBrowsingDataDialog() { } void BrowserWindowCocoa::ShowImportDialog() { - // Note that the dialog controller takes care of cleaning itself up - // upon dismissal so auto-scoping here is not necessary. - [[[ImportSettingsDialogController alloc] - initWithProfile:browser_->profile() parentWindow:window()] runModalDialog]; + [ImportSettingsDialogController + showImportSettingsDialogForProfile:browser_->profile()]; } void BrowserWindowCocoa::ShowSearchEnginesDialog() { |