diff options
| author | sadrul <sadrul@chromium.org> | 2016-01-13 00:56:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-13 08:57:27 +0000 |
| commit | 1e5ea7a809355aecd0acc5817d40f0ffbeea1476 (patch) | |
| tree | 442c6a32ed690c0926c6d011805e2246be43345c /components/web_view | |
| parent | b5e7b4126e67f6a881907392ed55a805563d50ee (diff) | |
| download | chromium_src-1e5ea7a809355aecd0acc5817d40f0ffbeea1476.zip chromium_src-1e5ea7a809355aecd0acc5817d40f0ffbeea1476.tar.gz chromium_src-1e5ea7a809355aecd0acc5817d40f0ffbeea1476.tar.bz2 | |
views/mus: Set-up transient windows correctly.
When a transient widget is created, make sure to set-up the transiency on mus
windows correctly as well.
Also, change policy in mus to allow adding/removing transient windows as long
as the client created either the parent or the child window.
Also, rename window-property defines in mus to have the MUS_ prefix, to avoid
conflict with the same macros for setting properties on aura::Windows.
BUG=none
Review URL: https://codereview.chromium.org/1462123002
Cr-Commit-Position: refs/heads/master@{#369121}
Diffstat (limited to 'components/web_view')
| -rw-r--r-- | components/web_view/frame.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/web_view/frame.cc b/components/web_view/frame.cc index 877a53f..62dca5a 100644 --- a/components/web_view/frame.cc +++ b/components/web_view/frame.cc @@ -25,12 +25,12 @@ using mus::Window; -DECLARE_WINDOW_PROPERTY_TYPE(web_view::Frame*); +MUS_DECLARE_WINDOW_PROPERTY_TYPE(web_view::Frame*); namespace web_view { // Used to find the Frame associated with a Window. -DEFINE_LOCAL_WINDOW_PROPERTY_KEY(Frame*, kFrame, nullptr); +MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(Frame*, kFrame, nullptr); namespace { |