diff options
Diffstat (limited to 'chrome/browser/ui')
38 files changed, 90 insertions, 102 deletions
diff --git a/chrome/browser/ui/input_window_dialog_win.cc b/chrome/browser/ui/input_window_dialog_win.cc index 3a63e1d..e55b44e 100644 --- a/chrome/browser/ui/input_window_dialog_win.cc +++ b/chrome/browser/ui/input_window_dialog_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -80,7 +80,7 @@ class ContentView : public views::DialogDelegateView, virtual bool Cancel() OVERRIDE; virtual void DeleteDelegate() OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; // views::TextfieldController: @@ -166,8 +166,8 @@ string16 ContentView::GetWindowTitle() const { return delegate_->window_title(); } -bool ContentView::IsModal() const { - return true; +ui::ModalType ContentView::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } views::View* ContentView::GetContentsView() { diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index 84cbe24..7e966ff 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -598,8 +598,8 @@ bool AboutChromeView::CanMaximize() const { return false; } -bool AboutChromeView::IsModal() const { - return true; +ui::ModalType AboutChromeView::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } bool AboutChromeView::Accept() { diff --git a/chrome/browser/ui/views/about_chrome_view.h b/chrome/browser/ui/views/about_chrome_view.h index 76b0896..549f689 100644 --- a/chrome/browser/ui/views/about_chrome_view.h +++ b/chrome/browser/ui/views/about_chrome_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -62,7 +62,7 @@ class AboutChromeView : public views::DialogDelegateView, virtual int GetDefaultDialogButton() const OVERRIDE; virtual bool CanResize() const OVERRIDE; virtual bool CanMaximize() const OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual bool Accept() OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 348632c..aaa62a4 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -105,8 +105,8 @@ bool BookmarkEditorView::IsDialogButtonEnabled(ui::DialogButton button) const { return true; } -bool BookmarkEditorView::IsModal() const { - return true; +ui::ModalType BookmarkEditorView::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } bool BookmarkEditorView::CanResize() const { diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h index d78a2c4..7d82d97 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h @@ -84,7 +84,7 @@ class BookmarkEditorView : public BookmarkEditor, // views::DialogDelegateView: virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual bool CanResize() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual bool Accept() OVERRIDE; diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index e0e53f2..77b6be3 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -351,8 +351,8 @@ bool CreateApplicationShortcutView::CanMaximize() const { return false; } -bool CreateApplicationShortcutView::IsModal() const { - return true; +ui::ModalType CreateApplicationShortcutView::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } string16 CreateApplicationShortcutView::GetWindowTitle() const { diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h index e5bb956..0602628 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.h +++ b/chrome/browser/ui/views/create_application_shortcut_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -47,7 +47,7 @@ class CreateApplicationShortcutView : public views::DialogDelegateView, virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; virtual bool CanResize() const OVERRIDE; virtual bool CanMaximize() const OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual bool Accept() OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc index 92bd120..a994ef7 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -107,8 +107,8 @@ void CryptoModulePasswordDialogView::Init( views::View* CryptoModulePasswordDialogView::GetInitiallyFocusedView() { return password_entry_; } -bool CryptoModulePasswordDialogView::IsModal() const { - return true; +ui::ModalType CryptoModulePasswordDialogView::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } views::View* CryptoModulePasswordDialogView::GetContentsView() { return this; diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.h b/chrome/browser/ui/views/crypto_module_password_dialog_view.h index 2eb50c2..049e0bc 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view.h +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -45,7 +45,7 @@ class CryptoModulePasswordDialogView : public views::DialogDelegateView, // views::WidgetDelegate: virtual views::View* GetInitiallyFocusedView() OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; // views::View: diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc index 6376c80..e18e867 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include <string> @@ -39,7 +39,7 @@ TEST_F(CryptoModulePasswordDialogViewTest, TestAccept) { base::Unretained(this))); CreateDialogCrypto(cb); EXPECT_EQ(dialog_->password_entry_, dialog_->GetInitiallyFocusedView()); - EXPECT_TRUE(dialog_->IsModal()); + EXPECT_TRUE(dialog_->GetModalType() != ui::MODAL_TYPE_NONE); const std::string kPassword = "diAl0g"; dialog_->password_entry_->SetText(UTF8ToUTF16(kPassword)); EXPECT_TRUE(dialog_->Accept()); diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc index 88526fa..dd3bc48 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -132,8 +132,8 @@ bool DownloadInProgressDialogView::Accept() { return true; } -bool DownloadInProgressDialogView::IsModal() const { - return true; +ui::ModalType DownloadInProgressDialogView::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } string16 DownloadInProgressDialogView::GetWindowTitle() const { diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h index 4fddbd4..d98611b 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -38,7 +38,7 @@ class DownloadInProgressDialogView : public views::DialogDelegateView { virtual int GetDefaultDialogButton() const OVERRIDE; virtual bool Cancel() OVERRIDE; virtual bool Accept() OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index ed87835..32a18c5 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -73,8 +73,8 @@ void EditSearchEngineDialog::Show(gfx::NativeWindow parent, contents->title_tf_->RequestFocus(); } -bool EditSearchEngineDialog::IsModal() const { - return true; +ui::ModalType EditSearchEngineDialog::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } string16 EditSearchEngineDialog::GetWindowTitle() const { diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.h b/chrome/browser/ui/views/edit_search_engine_dialog.h index 460aee5..c8fefec 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.h +++ b/chrome/browser/ui/views/edit_search_engine_dialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -42,7 +42,7 @@ class EditSearchEngineDialog : public views::TextfieldController, Profile* profile); // views::DialogDelegate: - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; virtual bool Cancel() OVERRIDE; diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc index c4addfe..8914c32 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.cc +++ b/chrome/browser/ui/views/extensions/extension_dialog.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -110,8 +110,8 @@ bool ExtensionDialog::CanResize() const { return false; } -bool ExtensionDialog::IsModal() const { - return true; +ui::ModalType ExtensionDialog::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } bool ExtensionDialog::ShouldShowWindowTitle() const { diff --git a/chrome/browser/ui/views/extensions/extension_dialog.h b/chrome/browser/ui/views/extensions/extension_dialog.h index dfef7fb7..b9faf9a 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.h +++ b/chrome/browser/ui/views/extensions/extension_dialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -54,7 +54,7 @@ class ExtensionDialog : public views::WidgetDelegate, // views::WidgetDelegate overrides. virtual bool CanResize() const OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual bool ShouldShowWindowTitle() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual void WindowClosing() OVERRIDE; diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index 9bb596bf..de9ee65 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -81,7 +81,7 @@ class ExtensionInstallDialogView : public views::DialogDelegateView, virtual bool Accept() OVERRIDE; // views::WidgetDelegate: - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; @@ -286,8 +286,8 @@ bool ExtensionInstallDialogView::Accept() { return true; } -bool ExtensionInstallDialogView::IsModal() const { - return true; +ui::ModalType ExtensionInstallDialogView::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } string16 ExtensionInstallDialogView::GetWindowTitle() const { diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc index a7a122e..c34ca97 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -75,7 +75,9 @@ class ExtensionUninstallDialogDelegateView : public views::DialogDelegateView { virtual bool Cancel() OVERRIDE; // views::WidgetDelegate: - virtual bool IsModal() const OVERRIDE { return true; } + virtual ui::ModalType GetModalType() const OVERRIDE { + return ui::MODAL_TYPE_NONE; + } virtual views::View* GetContentsView() OVERRIDE { return this; } virtual string16 GetWindowTitle() const OVERRIDE; diff --git a/chrome/browser/ui/views/external_protocol_dialog.h b/chrome/browser/ui/views/external_protocol_dialog.h index 0608baa..a2dd7db 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.h +++ b/chrome/browser/ui/views/external_protocol_dialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -44,9 +44,6 @@ class ExternalProtocolDialog : public views::DialogDelegate { virtual views::Widget* GetWidget() OVERRIDE; virtual const views::Widget* GetWidget() const OVERRIDE; - // views::WidgetDelegate methods: - virtual bool IsModal() const OVERRIDE { return false; } - private: // The message box view whose commands we handle. views::MessageBoxView* message_box_view_; diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index e11503e..ca2c195 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -1524,10 +1524,6 @@ bool BrowserView::CanActivate() const { return !ActivateAppModalDialog(); } -bool BrowserView::IsModal() const { - return false; -} - string16 BrowserView::GetWindowTitle() const { return browser_->GetWindowTitleForCurrentTab(); } diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 5cbc987..04c2976 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -382,7 +382,6 @@ class BrowserView : public BrowserWindow, virtual bool CanResize() const OVERRIDE; virtual bool CanMaximize() const OVERRIDE; virtual bool CanActivate() const OVERRIDE; - virtual bool IsModal() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual string16 GetAccessibleWindowTitle() const OVERRIDE; virtual views::View* GetInitiallyFocusedView() OVERRIDE; diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index cf9bc8c..b409e01 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -101,10 +101,10 @@ bool HtmlDialogView::CanResize() const { return true; } -bool HtmlDialogView::IsModal() const { - if (delegate_) - return delegate_->IsDialogModal(); - return false; +ui::ModalType HtmlDialogView::GetModalType() const { + if (delegate_ && delegate_->IsDialogModal()) + return ui::MODAL_TYPE_WINDOW; + return ui::MODAL_TYPE_NONE; } string16 HtmlDialogView::GetWindowTitle() const { @@ -145,7 +145,7 @@ const views::Widget* HtmlDialogView::GetWidget() const { // HtmlDialogUIDelegate implementation: bool HtmlDialogView::IsDialogModal() const { - return IsModal(); + return GetModalType() != ui::MODAL_TYPE_NONE; } string16 HtmlDialogView::GetDialogTitle() const { diff --git a/chrome/browser/ui/views/html_dialog_view.h b/chrome/browser/ui/views/html_dialog_view.h index f0909fb..d5ba2e9e 100644 --- a/chrome/browser/ui/views/html_dialog_view.h +++ b/chrome/browser/ui/views/html_dialog_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -55,7 +55,7 @@ class HtmlDialogView // Overridden from views::WidgetDelegate: virtual bool CanResize() const OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual void WindowClosing() OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc index 3739a5f..75b9463 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -76,10 +76,6 @@ string16 ImportLockDialogView::GetDialogButtonLabel( return string16(); } -bool ImportLockDialogView::IsModal() const { - return false; -} - string16 ImportLockDialogView::GetWindowTitle() const { return l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_TITLE); } diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.h b/chrome/browser/ui/views/importer/import_lock_dialog_view.h index de3dc0c..4904ff4 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.h +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -34,7 +34,6 @@ class ImportLockDialogView : public views::DialogDelegateView { // views::DialogDelegate: virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; - virtual bool IsModal() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual bool Accept() OVERRIDE; virtual bool Cancel() OVERRIDE; diff --git a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc index 97150b7..375644c 100644 --- a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -120,8 +120,8 @@ string16 ImportProgressDialogView::GetDialogButtonLabel( return l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_CANCEL); } -bool ImportProgressDialogView::IsModal() const { - return parent_window_ != NULL; +ui::ModalType ImportProgressDialogView::GetModalType() const { + return parent_window_ ? ui::MODAL_TYPE_WINDOW : ui::MODAL_TYPE_NONE; } string16 ImportProgressDialogView::GetWindowTitle() const { diff --git a/chrome/browser/ui/views/importer/import_progress_dialog_view.h b/chrome/browser/ui/views/importer/import_progress_dialog_view.h index 0db1ad8..77307ab 100644 --- a/chrome/browser/ui/views/importer/import_progress_dialog_view.h +++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -47,7 +47,7 @@ class ImportProgressDialogView : public views::DialogDelegateView, // views::DialogDelegate: virtual int GetDialogButtons() const OVERRIDE; virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual bool Cancel() OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc index 488b6c5..414b303 100644 --- a/chrome/browser/ui/views/instant_confirm_view.cc +++ b/chrome/browser/ui/views/instant_confirm_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -77,8 +77,8 @@ gfx::Size InstantConfirmView::GetPreferredSize() { return gfx::Size(pref_width, pref_height); } -bool InstantConfirmView::IsModal() const { - return true; +ui::ModalType InstantConfirmView::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } void InstantConfirmView::LinkClicked(views::Link* source, int event_flags) { diff --git a/chrome/browser/ui/views/instant_confirm_view.h b/chrome/browser/ui/views/instant_confirm_view.h index c46e29d..128687a6 100644 --- a/chrome/browser/ui/views/instant_confirm_view.h +++ b/chrome/browser/ui/views/instant_confirm_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -27,7 +27,7 @@ class InstantConfirmView : public views::DialogDelegateView, virtual views::View* GetContentsView() OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual gfx::Size GetPreferredSize() OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; // views::LinkListener overrides: virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index dad8f9b..bd9b950 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -136,8 +136,8 @@ string16 JSModalDialogViews::GetDialogButtonLabel( /////////////////////////////////////////////////////////////////////////////// // JSModalDialogViews, views::WidgetDelegate implementation: -bool JSModalDialogViews::IsModal() const { - return true; +ui::ModalType JSModalDialogViews::GetModalType() const { + return ui::MODAL_TYPE_SYSTEM; } views::View* JSModalDialogViews::GetContentsView() { diff --git a/chrome/browser/ui/views/js_modal_dialog_views.h b/chrome/browser/ui/views/js_modal_dialog_views.h index 0f189ac..7dffcc2 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.h +++ b/chrome/browser/ui/views/js_modal_dialog_views.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -41,7 +41,7 @@ class JSModalDialogViews : public NativeAppModalDialog, virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; // Overridden from views::WidgetDelegate: - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; virtual views::View* GetInitiallyFocusedView() OVERRIDE; virtual void OnClose() OVERRIDE; diff --git a/chrome/browser/ui/views/restart_message_box.cc b/chrome/browser/ui/views/restart_message_box.cc index a85f6e4..d313abc 100644 --- a/chrome/browser/ui/views/restart_message_box.cc +++ b/chrome/browser/ui/views/restart_message_box.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -38,8 +38,8 @@ void RestartMessageBox::DeleteDelegate() { delete this; } -bool RestartMessageBox::IsModal() const { - return true; +ui::ModalType RestartMessageBox::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } views::View* RestartMessageBox::GetContentsView() { diff --git a/chrome/browser/ui/views/restart_message_box.h b/chrome/browser/ui/views/restart_message_box.h index 9aa9854..d629698 100644 --- a/chrome/browser/ui/views/restart_message_box.h +++ b/chrome/browser/ui/views/restart_message_box.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -29,7 +29,7 @@ class RestartMessageBox : public views::DialogDelegate { // views::WidgetDelegate: virtual void DeleteDelegate() OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; virtual views::Widget* GetWidget() OVERRIDE; virtual const views::Widget* GetWidget() const OVERRIDE; diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc index 5581baa..1dc7176 100644 --- a/chrome/browser/ui/views/simple_message_box_views.cc +++ b/chrome/browser/ui/views/simple_message_box_views.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -102,8 +102,8 @@ void SimpleMessageBoxViews::DeleteDelegate() { Release(); } -bool SimpleMessageBoxViews::IsModal() const { - return true; +ui::ModalType SimpleMessageBoxViews::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } views::View* SimpleMessageBoxViews::GetContentsView() { diff --git a/chrome/browser/ui/views/simple_message_box_views.h b/chrome/browser/ui/views/simple_message_box_views.h index 7b66876..94e2a88 100644 --- a/chrome/browser/ui/views/simple_message_box_views.h +++ b/chrome/browser/ui/views/simple_message_box_views.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -56,7 +56,7 @@ class SimpleMessageBoxViews : public views::DialogDelegate, virtual bool ShouldShowWindowTitle() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual void DeleteDelegate() OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; virtual views::Widget* GetWidget() OVERRIDE; virtual const views::Widget* GetWidget() const OVERRIDE; diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index 7c1f696..0362b7f 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -68,8 +68,8 @@ void UpdateRecommendedMessageBox::DeleteDelegate() { delete this; } -bool UpdateRecommendedMessageBox::IsModal() const { - return true; +ui::ModalType UpdateRecommendedMessageBox::GetModalType() const { + return ui::MODAL_TYPE_WINDOW; } views::View* UpdateRecommendedMessageBox::GetContentsView() { diff --git a/chrome/browser/ui/views/update_recommended_message_box.h b/chrome/browser/ui/views/update_recommended_message_box.h index 20db017..fbfc667 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.h +++ b/chrome/browser/ui/views/update_recommended_message_box.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -33,7 +33,7 @@ class UpdateRecommendedMessageBox : public views::DialogDelegate { virtual bool ShouldShowWindowTitle() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual void DeleteDelegate() OVERRIDE; - virtual bool IsModal() const OVERRIDE; + virtual ui::ModalType GetModalType() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; virtual views::Widget* GetWidget() OVERRIDE; virtual const views::Widget* GetWidget() const OVERRIDE; diff --git a/chrome/browser/ui/views/user_data_dir_dialog.h b/chrome/browser/ui/views/user_data_dir_dialog.h index 17a882f..3e0bb87 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog.h +++ b/chrome/browser/ui/views/user_data_dir_dialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -41,7 +41,6 @@ class UserDataDirDialog : public views::DialogDelegate, virtual bool Cancel() OVERRIDE; // views::WidgetDelegate methods: - virtual bool IsModal() const OVERRIDE { return false; } virtual views::View* GetContentsView() OVERRIDE; virtual views::Widget* GetWidget() OVERRIDE; virtual const views::Widget* GetWidget() const OVERRIDE; |