diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 03:52:12 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 03:52:12 +0000 |
commit | 2a906c0076ac3f7efd17450f12869c7c3429f983 (patch) | |
tree | 82b9d94ea5c21f609aed47432208dd4212fc6290 /ash/shell_unittest.cc | |
parent | 42c86025c01c567bbfaeceeb21a900baa21ed14e (diff) | |
download | chromium_src-2a906c0076ac3f7efd17450f12869c7c3429f983.zip chromium_src-2a906c0076ac3f7efd17450f12869c7c3429f983.tar.gz chromium_src-2a906c0076ac3f7efd17450f12869c7c3429f983.tar.bz2 |
Makes Widget modality a 3-state type rather than a boolean.
There are actually two types of modality that the WM might care about - window modality and system modality. See the definitions of these in ui/base/ui_base_types.h.
This is a precursor to adding support for window modality to Ash. Right now we only do system modality which is undesirable for almost all cases of window modality.
http://crbug.com/109290
TEST=none
Review URL: http://codereview.chromium.org/9109035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
-rw-r--r-- | ash/shell_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index cab9f9f..22b3209 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -65,8 +65,8 @@ class ModalWindow : public views::WidgetDelegateView { virtual string16 GetWindowTitle() const OVERRIDE { return ASCIIToUTF16("Modal Window"); } - virtual bool IsModal() const OVERRIDE { - return true; + virtual ui::ModalType GetModalType() const OVERRIDE { + return ui::MODAL_TYPE_WINDOW; } private: |