Ports SystemModalContainerLayoutManager to ash/common

Ports SystemModalContainerLayoutManager to ash/common

BUG=644860
TEST=covered by tests
R=jamescook@chromium.org

Committed: https://crrev.com/ea4ca940a5939c6f389b37594f8eb0b9ad0673fb
Cr-Commit-Position: refs/heads/master@{#418068}

[sky, 2016-09-12 16:42:44]

The CQ bit was checked by sky@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-12 16:43:12]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-12 17:58:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-12 17:58:50]

Dry run: This issue passed the CQ dry run.

[James Cook, 2016-09-12 19:24:28]

LGTM with nits

https://codereview.chromium.org/2336653002/diff/20001/ash/aura/wm_window_aura.cc
File ash/aura/wm_window_aura.cc (right):

https://codereview.chromium.org/2336653002/diff/20001/ash/aura/wm_window_aura...
ash/aura/wm_window_aura.cc:796: wm_property = WmWindowProperty::MODAL_TYPE;
optional: You could sort all these ifs() too, which would make it slightly
easier to see that you're not missing a case.

https://codereview.chromium.org/2336653002/diff/20001/ash/common/wm/system_mo...
File ash/common/wm/system_modal_container_layout_manager.cc (right):

https://codereview.chromium.org/2336653002/diff/20001/ash/common/wm/system_mo...
ash/common/wm/system_modal_container_layout_manager.cc:45: :
WmSnapToPixelLayoutManager(), container_(container) {}
nit: WmSnapToPixelLayoutManager() not needed

optional: DCHECK(container_) so the reader can trivially figure out that it's
required

https://codereview.chromium.org/2336653002/diff/20001/ash/common/wm/system_mo...
File ash/common/wm/system_modal_container_layout_manager.h (right):

https://codereview.chromium.org/2336653002/diff/20001/ash/common/wm/system_mo...
ash/common/wm/system_modal_container_layout_manager.h:45: // Overridden from
aura::WindowObserver:
nit: WmWindowObserver

https://codereview.chromium.org/2336653002/diff/20001/ash/common/wm_window_pr...
File ash/common/wm_window_property.h (right):

https://codereview.chromium.org/2336653002/diff/20001/ash/common/wm_window_pr...
ash/common/wm_window_property.h:31: };
Hooray for alphabetical sorting!

[sky, 2016-09-12 19:29:44]

The CQ bit was checked by sky@chromium.org

[sky, 2016-09-12 19:29:44]

The patchset sent to the CQ was uploaded after l-g-t-m from
jamescook@chromium.org
Link to the patchset: https://codereview.chromium.org/2336653002/#ps40001
(title: "comments")

[commit-bot: I haz the power, 2016-09-12 19:30:17]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-12 20:39:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-12 20:39:31]

Failed to apply patch for ash/common/wm_window_property.h:
While running git apply --index -3 -p1;
  error: patch failed: ash/common/wm_window_property.h:9
  Falling back to three-way merge...
  Applied patch to 'ash/common/wm_window_property.h' with conflicts.
  U ash/common/wm_window_property.h

Patch:       ash/common/wm_window_property.h
Index: ash/common/wm_window_property.h
diff --git a/ash/common/wm_window_property.h b/ash/common/wm_window_property.h
index
b96903567933ab61f8eca8e8c17b1a4429c590a4..02e3086cb46f56c1d68ba3eb221afb5f87c057a4
100644
--- a/ash/common/wm_window_property.h
+++ b/ash/common/wm_window_property.h
@@ -9,22 +9,25 @@ namespace ash {
 
 enum class WmWindowProperty {
   // Type bool.
-  SNAP_CHILDREN_TO_PIXEL_BOUNDARY,
-
-  // Type bool.
   ALWAYS_ON_TOP,
 
+  // Type bool. See aura::client:kExcludeFromMruKey for details.
+  EXCLUDE_FROM_MRU,
+
+  // Type int, but cast to ui::ModalType.
+  MODAL_TYPE,
+
   // Type int.
   SHELF_ID,
 
   // Type ShelfItemDetails.
   SHELF_ITEM_DETAILS,
 
+  // Type bool.
+  SNAP_CHILDREN_TO_PIXEL_BOUNDARY,
+
   // Type int. See aura::client::kTopViewInset for details.
   TOP_VIEW_INSET,
-
-  // Type bool. See aura::client:kExcludeFromMruKey for details.
-  EXCLUDE_FROM_MRU,
 };
 
 }  // namespace ash

[sky, 2016-09-12 20:45:05]

The CQ bit was checked by sky@chromium.org

[sky, 2016-09-12 20:45:06]

The patchset sent to the CQ was uploaded after l-g-t-m from
jamescook@chromium.org
Link to the patchset: https://codereview.chromium.org/2336653002/#ps60001
(title: "merge again")

[commit-bot: I haz the power, 2016-09-12 20:45:26]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[sky, 2016-09-12 20:46:55]

https://codereview.chromium.org/2336653002/diff/20001/ash/aura/wm_window_aura.cc
File ash/aura/wm_window_aura.cc (right):

https://codereview.chromium.org/2336653002/diff/20001/ash/aura/wm_window_aura...
ash/aura/wm_window_aura.cc:796: wm_property = WmWindowProperty::MODAL_TYPE;
On 2016/09/12 19:24:28, James Cook wrote:
> optional: You could sort all these ifs() too, which would make it slightly
> easier to see that you're not missing a case.

Done.

https://codereview.chromium.org/2336653002/diff/20001/ash/common/wm/system_mo...
File ash/common/wm/system_modal_container_layout_manager.cc (right):

https://codereview.chromium.org/2336653002/diff/20001/ash/common/wm/system_mo...
ash/common/wm/system_modal_container_layout_manager.cc:45: :
WmSnapToPixelLayoutManager(), container_(container) {}
On 2016/09/12 19:24:28, James Cook wrote:
> nit: WmSnapToPixelLayoutManager() not needed
> 
> optional: DCHECK(container_) so the reader can trivially figure out that it's
> required

Done.

https://codereview.chromium.org/2336653002/diff/20001/ash/common/wm/system_mo...
File ash/common/wm/system_modal_container_layout_manager.h (right):

https://codereview.chromium.org/2336653002/diff/20001/ash/common/wm/system_mo...
ash/common/wm/system_modal_container_layout_manager.h:45: // Overridden from
aura::WindowObserver:
On 2016/09/12 19:24:28, James Cook wrote:
> nit: WmWindowObserver

Done.

[commit-bot: I haz the power, 2016-09-12 21:56:40]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-09-12 21:58:10]

Description was changed from

==========
Ports SystemModalContainerLayoutManager to ash/common

BUG=644860
TEST=covered by tests
R=jamescook@chromium.org
==========

to

==========
Ports SystemModalContainerLayoutManager to ash/common

BUG=644860
TEST=covered by tests
R=jamescook@chromium.org

Committed: https://crrev.com/ea4ca940a5939c6f389b37594f8eb0b9ad0673fb
Cr-Commit-Position: refs/heads/master@{#418068}
==========

[commit-bot: I haz the power, 2016-09-12 21:58:11]

Patchset 4 (id:??) landed as
https://crrev.com/ea4ca940a5939c6f389b37594f8eb0b9ad0673fb
Cr-Commit-Position: refs/heads/master@{#418068}