diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-20 02:40:21 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-20 02:40:21 +0000 |
| commit | dd86209f364eb604bb42a47dea7ae177d7166632 (patch) | |
| tree | 40ed570fbfc0881a4e1c7469f2670427d47be0ae /chrome | |
| parent | 119e524fbad1110f0e898d5bc24cbdefa9436415 (diff) | |
| download | chromium_src-dd86209f364eb604bb42a47dea7ae177d7166632.zip chromium_src-dd86209f364eb604bb42a47dea7ae177d7166632.tar.gz chromium_src-dd86209f364eb604bb42a47dea7ae177d7166632.tar.bz2 | |
Make gtk url picker and edit keyword view modal.
Don't like that GTK only does app-modal rather than window modal, but otherwise you can just close the parent window and crash when you then click okay on the dialog.
BUG=11507
Review URL: http://codereview.chromium.org/141020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/edit_keyword_controller.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/gtk/options/url_picker_dialog_gtk.cc | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/gtk/edit_keyword_controller.cc b/chrome/browser/gtk/edit_keyword_controller.cc index 7599ea4..cc93896 100644 --- a/chrome/browser/gtk/edit_keyword_controller.cc +++ b/chrome/browser/gtk/edit_keyword_controller.cc @@ -77,10 +77,8 @@ void EditKeywordController::Init(GtkWindow* parent_window) { template_url() ? IDS_SEARCH_ENGINES_EDITOR_EDIT_WINDOW_TITLE : IDS_SEARCH_ENGINES_EDITOR_NEW_WINDOW_TITLE).c_str(), - // In views, this is window-modal. GTK only does app-modal which is - // overkill, so we'll just settle for being a non-modal transient. parent_window, - GTK_DIALOG_NO_SEPARATOR, + static_cast<GtkDialogFlags>(GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc index 12de582..6fa9a39 100644 --- a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc +++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc @@ -28,8 +28,7 @@ UrlPickerDialogGtk::UrlPickerDialogGtk(UrlPickerCallback* callback, dialog_ = gtk_dialog_new_with_buttons( l10n_util::GetStringUTF8(IDS_ASI_ADD_TITLE).c_str(), parent, - // Non-modal. - GTK_DIALOG_NO_SEPARATOR, + static_cast<GtkDialogFlags>(GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); |