Resolve conflict in exo/wayland/server.cc in m53 branch

Resolve conflict in exo/wayland/server.cc in m53 branch

The method OnDisplayWorkareInsetsChanged has been removed on ToT, so this method wasn't updated in the original CL.

BUG=632083
TBR=hidehiko@chromium.org

Cr-Commit-Position: refs/branch-heads/2785@{#484}
Cr-Branched-From: 68623971be0cfc492a2cb0427d7f478e7b214c24-refs/heads/master@{#403382}

[modify] https://crrev.com/9f38962edfcc46c2dc91b426ce24fa43993529cc/components/exo/wayland/server.cc

Committed: https://chromium.googlesource.com/chromium/src/+/9a9853c91d1c2cb9ac862373603b1304859a6e35

[oshima, 2016-08-03 14:02:58]

Description was changed from

==========
Resolve conflict

The method OnDisplayWorkareInsetsChanged has been removed on ToT

BUG=632083
==========

to

==========
Resolve conflict in exo/wayland/server.cc in m53 branch

The method OnDisplayWorkareInsetsChanged has been removed on ToT

BUG=632083
==========

[oshima, 2016-08-03 14:02:59]

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

[oshima, 2016-08-03 14:03:27]

Description was changed from

==========
Resolve conflict in exo/wayland/server.cc in m53 branch

The method OnDisplayWorkareInsetsChanged has been removed on ToT

BUG=632083
==========

to

==========
Resolve conflict in exo/wayland/server.cc in m53 branch

The method OnDisplayWorkareInsetsChanged has been removed on ToT

BUG=632083
TBR=hidehiko@chromium.org
==========

[oshima, 2016-08-03 14:03:27]

oshima@chromium.org changed reviewers:
+ hidehiko@chromium.org
- oshima@chromium.org

[oshima, 2016-08-03 14:04:12]

Description was changed from

==========
Resolve conflict in exo/wayland/server.cc in m53 branch

The method OnDisplayWorkareInsetsChanged has been removed on ToT

BUG=632083
TBR=hidehiko@chromium.org
==========

to

==========
Resolve conflict in exo/wayland/server.cc in m53 branch

The method OnDisplayWorkareInsetsChanged has been removed on ToT, so this method
wasn't updated in the original CL.

BUG=632083
TBR=hidehiko@chromium.org
==========

[oshima, 2016-08-03 15:57:10]

Description was changed from

==========
Resolve conflict in exo/wayland/server.cc in m53 branch

The method OnDisplayWorkareInsetsChanged has been removed on ToT, so this method
wasn't updated in the original CL.

BUG=632083
TBR=hidehiko@chromium.org
==========

to

==========
Resolve conflict in exo/wayland/server.cc in m53 branch

The method OnDisplayWorkareInsetsChanged has been removed on ToT, so this method
wasn't updated in the original CL.

BUG=632083
TBR=hidehiko@chromium.org

Cr-Commit-Position: refs/branch-heads/2785@{#484}
Cr-Branched-From:
68623971be0cfc492a2cb0427d7f478e7b214c24-refs/heads/master@{#403382}

[modify]
https://crrev.com/9f38962edfcc46c2dc91b426ce24fa43993529cc/components/exo/way...
==========

[hidehiko, 2016-08-03 18:11:32]

https://codereview.chromium.org/2203393002/diff/1/components/exo/wayland/serv...
File components/exo/wayland/server.cc (right):

https://codereview.chromium.org/2203393002/diff/1/components/exo/wayland/serv...
components/exo/wayland/server.cc:1621: SendConfigure_DEPRECATED();
Maybe: SendConfigure_DEPRECATED(primary);

?

[oshima, 2016-08-03 22:39:05]

On 2016/08/03 18:11:32, hidehiko wrote:
>
https://codereview.chromium.org/2203393002/diff/1/components/exo/wayland/serv...
> File components/exo/wayland/server.cc (right):
> 
>
https://codereview.chromium.org/2203393002/diff/1/components/exo/wayland/serv...
> components/exo/wayland/server.cc:1621: SendConfigure_DEPRECATED();
> Maybe: SendConfigure_DEPRECATED(primary);
> 
> ?

Doh, sorry. looks like exo doesn't build this part. Fixed.

[oshima, 2016-08-03 22:45:40]

Description was changed from

==========
Resolve conflict in exo/wayland/server.cc in m53 branch

The method OnDisplayWorkareInsetsChanged has been removed on ToT, so this method
wasn't updated in the original CL.

BUG=632083
TBR=hidehiko@chromium.org

Cr-Commit-Position: refs/branch-heads/2785@{#484}
Cr-Branched-From:
68623971be0cfc492a2cb0427d7f478e7b214c24-refs/heads/master@{#403382}

[modify]
https://crrev.com/9f38962edfcc46c2dc91b426ce24fa43993529cc/components/exo/way...
==========

to

==========
Resolve conflict in exo/wayland/server.cc in m53 branch

The method OnDisplayWorkareInsetsChanged has been removed on ToT, so this method
wasn't updated in the original CL.

BUG=632083
TBR=hidehiko@chromium.org

Cr-Commit-Position: refs/branch-heads/2785@{#484}
Cr-Branched-From:
68623971be0cfc492a2cb0427d7f478e7b214c24-refs/heads/master@{#403382}

[modify]
https://crrev.com/9f38962edfcc46c2dc91b426ce24fa43993529cc/components/exo/way...

Committed:
https://chromium.googlesource.com/chromium/src/+/9a9853c91d1c2cb9ac862373603b...
==========

[oshima, 2016-08-03 22:45:41]

Committed patchset #2 (id:20001) manually as
9a9853c91d1c2cb9ac862373603b1304859a6e35 (presubmit successful).