Chrome OS: Ash support for >=3 displays.

Chrome OS: Ash support for >=3 displays.

As the first step, for >=3 displays we always use
horizontal layout and disallow mirroring.

This would allow basic multi-display functionality.

BUG=422161
TEST=trybot

Committed: https://crrev.com/5aeca9582437a4baed70b1a6cf707e654cb3517b
Cr-Commit-Position: refs/heads/master@{#307154}

[hshi1, 2014-10-16 01:35:05]

Patchset #3 (id:40001) has been deleted

[hshi1, 2014-12-04 23:29:01]

hshi@chromium.org changed reviewers:
+ oshima@chromium.org

[hshi1, 2014-12-04 23:29:02]

Per our discussion we can land this even though the multi-display support work
in ozone/freon is still ongoing.

This change aims to keep the single- and dual-display behavior exactly the same
as-is, but allow >=3 display configurations (with the very limited, hard-coded
horizontal layout).

[oshima, 2014-12-05 22:18:15]

can you add unit test for 3 displays case?

https://codereview.chromium.org/657583003/diff/160001/ash/wm/drag_window_resi...
File ash/wm/drag_window_resizer.cc (right):

https://codereview.chromium.org/657583003/diff/160001/ash/wm/drag_window_resi...
ash/wm/drag_window_resizer.cc:41: std::vector<aura::Window*> other_root_windows;
any reason not to use aura::Window::Windows?

https://codereview.chromium.org/657583003/diff/160001/ash/wm/drag_window_resi...
ash/wm/drag_window_resizer.cc:203: !in_original_root ? 1 : (kMaxOpacity *
fraction_in_another_window);
indent

https://codereview.chromium.org/657583003/diff/160001/ash/wm/drag_window_resi...
File ash/wm/drag_window_resizer.h (right):

https://codereview.chromium.org/657583003/diff/160001/ash/wm/drag_window_resi...
ash/wm/drag_window_resizer.h:54: std::vector<scoped_ptr<DragWindowController> >
drag_window_controllers_;
scopdvector?

And I believe space is no longer necessary in c++11. (I may be wrong tho)

https://codereview.chromium.org/657583003/diff/160001/ui/display/chromeos/dis...
File ui/display/chromeos/display_configurator.cc (right):

https://codereview.chromium.org/657583003/diff/160001/ui/display/chromeos/dis...
ui/display/chromeos/display_configurator.cc:1009: default: {
add comment that this is for >3 case.

https://codereview.chromium.org/657583003/diff/160001/ui/display/chromeos/dis...
ui/display/chromeos/display_configurator.cc:1011: return
MULTIPLE_DISPLAY_STATE_SINGLE;
don't you have to handle == 2 case?

https://codereview.chromium.org/657583003/diff/160001/ui/display/types/displa...
File ui/display/types/display_constants.h (right):

https://codereview.chromium.org/657583003/diff/160001/ui/display/types/displa...
ui/display/types/display_constants.h:17: MULTIPLE_DISPLAY_STATE_MULTI_EXTENDED,
Can you add TODO(oshima) to consolidate DUAL_ and MULTI_ ?

[hshi1, 2014-12-05 23:25:13]

https://codereview.chromium.org/657583003/diff/160001/ash/wm/drag_window_resi...
File ash/wm/drag_window_resizer.cc (right):

https://codereview.chromium.org/657583003/diff/160001/ash/wm/drag_window_resi...
ash/wm/drag_window_resizer.cc:41: std::vector<aura::Window*> other_root_windows;
On 2014/12/05 22:18:15, oshima wrote:
> any reason not to use aura::Window::Windows?

Done.

https://codereview.chromium.org/657583003/diff/160001/ash/wm/drag_window_resi...
ash/wm/drag_window_resizer.cc:203: !in_original_root ? 1 : (kMaxOpacity *
fraction_in_another_window);
On 2014/12/05 22:18:15, oshima wrote:
> indent

Done.

https://codereview.chromium.org/657583003/diff/160001/ash/wm/drag_window_resi...
File ash/wm/drag_window_resizer.h (right):

https://codereview.chromium.org/657583003/diff/160001/ash/wm/drag_window_resi...
ash/wm/drag_window_resizer.h:54: std::vector<scoped_ptr<DragWindowController> >
drag_window_controllers_;
On 2014/12/05 22:18:15, oshima wrote:
> scopdvector?
> 
> And I believe space is no longer necessary in c++11. (I may be wrong tho)

Done.

https://codereview.chromium.org/657583003/diff/160001/ui/display/chromeos/dis...
File ui/display/chromeos/display_configurator.cc (right):

https://codereview.chromium.org/657583003/diff/160001/ui/display/chromeos/dis...
ui/display/chromeos/display_configurator.cc:1009: default: {
On 2014/12/05 22:18:15, oshima wrote:
> add comment that this is for >3 case. 

Acknowledged.

https://codereview.chromium.org/657583003/diff/160001/ui/display/chromeos/dis...
ui/display/chromeos/display_configurator.cc:1011: return
MULTIPLE_DISPLAY_STATE_SINGLE;
On 2014/12/05 22:18:15, oshima wrote:
> don't you have to handle == 2 case?

I think it is actually better to just handle the cases based on number of on
displays.

https://codereview.chromium.org/657583003/diff/160001/ui/display/types/displa...
File ui/display/types/display_constants.h (right):

https://codereview.chromium.org/657583003/diff/160001/ui/display/types/displa...
ui/display/types/display_constants.h:17: MULTIPLE_DISPLAY_STATE_MULTI_EXTENDED,
On 2014/12/05 22:18:15, oshima wrote:
> Can you add TODO(oshima) to consolidate DUAL_ and MULTI_ ?

Done.

[oshima, 2014-12-05 23:29:56]

lgtm

https://codereview.chromium.org/657583003/diff/180001/ui/display/chromeos/dis...
File ui/display/chromeos/display_configurator.cc (right):

https://codereview.chromium.org/657583003/diff/180001/ui/display/chromeos/dis...
ui/display/chromeos/display_configurator.cc:993: default: {
nit: just "default:"

https://codereview.chromium.org/657583003/diff/180001/ui/display/chromeos/dis...
ui/display/chromeos/display_configurator.cc:1012: }
nit: remove else{} and just NOTREACHED().

[hshi1, 2014-12-05 23:35:19]

https://codereview.chromium.org/657583003/diff/180001/ui/display/chromeos/dis...
File ui/display/chromeos/display_configurator.cc (right):

https://codereview.chromium.org/657583003/diff/180001/ui/display/chromeos/dis...
ui/display/chromeos/display_configurator.cc:993: default: {
On 2014/12/05 23:29:56, oshima wrote:
> nit: just "default:"

Done.

https://codereview.chromium.org/657583003/diff/180001/ui/display/chromeos/dis...
ui/display/chromeos/display_configurator.cc:1012: }
On 2014/12/05 23:29:56, oshima wrote:
> nit: remove else{} and just NOTREACHED().

Done.

[hshi1, 2014-12-05 23:35:24]

The CQ bit was checked by hshi@chromium.org

[commit-bot: I haz the power, 2014-12-05 23:35:54]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/657583003/200001

[commit-bot: I haz the power, 2014-12-06 00:28:08]

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

[commit-bot: I haz the power, 2014-12-06 00:28:09]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel_ng on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[hshi1, 2014-12-06 00:44:28]

The CQ bit was checked by hshi@chromium.org

[commit-bot: I haz the power, 2014-12-06 00:45:06]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/657583003/220001

[commit-bot: I haz the power, 2014-12-06 01:40:24]

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

[commit-bot: I haz the power, 2014-12-06 01:40:25]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel_ng on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[hshi1, 2014-12-06 01:45:34]

The CQ bit was checked by hshi@chromium.org

[commit-bot: I haz the power, 2014-12-06 01:46:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/657583003/240001

[commit-bot: I haz the power, 2014-12-06 03:04:28]

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

[commit-bot: I haz the power, 2014-12-06 03:04:29]

Failed to apply patch for ash/display/screen_ash.cc:
While running git apply --index -3 -p1;
  error: patch failed: ash/display/screen_ash.cc:161
  Falling back to three-way merge...
  Applied patch to 'ash/display/screen_ash.cc' with conflicts.
  U ash/display/screen_ash.cc

Patch:       ash/display/screen_ash.cc
Index: ash/display/screen_ash.cc
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
index
d3bdd609fa0100d198ad9f42c7a44f0a96422612..936ea74c60baa11c81295961e6070f3b3773316e
100644
--- a/ash/display/screen_ash.cc
+++ b/ash/display/screen_ash.cc
@@ -161,7 +161,7 @@ gfx::Rect ScreenAsh::ConvertRectFromScreen(aura::Window*
window,
 // static
 const gfx::Display& ScreenAsh::GetSecondaryDisplay() {
   DisplayManager* display_manager = GetDisplayManager();
-  CHECK_EQ(2U, display_manager->GetNumDisplays());
+  CHECK_LE(2U, display_manager->GetNumDisplays());
   return display_manager->GetDisplayAt(0).id() ==
       Shell::GetScreen()->GetPrimaryDisplay().id() ?
       display_manager->GetDisplayAt(1) : display_manager->GetDisplayAt(0);

[commit-bot: I haz the power, 2014-12-06 03:04:43]

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

[hshi1, 2014-12-06 03:08:13]

The CQ bit was checked by hshi@chromium.org

[commit-bot: I haz the power, 2014-12-06 03:09:37]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/657583003/260001

[commit-bot: I haz the power, 2014-12-06 03:55:14]

Committed patchset #13 (id:260001)

[commit-bot: I haz the power, 2014-12-06 03:56:00]

Patchset 13 (id:??) landed as
https://crrev.com/5aeca9582437a4baed70b1a6cf707e654cb3517b
Cr-Commit-Position: refs/heads/master@{#307154}