Site Settings Android: Move Autoplay and Protected Content to Media menu.

Site Settings Android: Move Autoplay and Protected Content to Media menu.

This moves the Autoplay and Protected Content permissions under a sub-menu
called Media. Note: If only one of the two (Autoplay or Protected Content)
is visible, the one that is visible shows up on the main Site Settings menu
instead (no point in having a sub-menu with only one item).

BUG=604753
Committed: https://crrev.com/b9738b67be66a0e56e6951e97274332c0d666d28
Cr-Commit-Position: refs/heads/master@{#393365}

[Finnur, 2016-05-12 13:48:44]

Patchset #1 (id:1) has been deleted

[Finnur, 2016-05-12 13:51:34]

finnur@chromium.org changed reviewers:
+ dfalcantara@chromium.org, twellington@chromium.org

[Finnur, 2016-05-12 13:51:35]

Theresa, can you review?
And Dan, can you provide OWNERS approval (mostly the string, I guess)?

[Finnur, 2016-05-12 13:51:56]

Description was changed from

==========
Site Settings Android: Move Autoplay and Protected Content to Media menu.

This moves the Autoplay and Protected Content permissions under a sub-menu
called Media. Note: If only one of the two (Autoplay or Protected Content)
are visible, the one that is visible shows up on the main Site Settings menu
instead (no point in having a sub-menu with only one item).

BUG=604753
==========

to

==========
Site Settings Android: Move Autoplay and Protected Content to Media menu.

This moves the Autoplay and Protected Content permissions under a sub-menu
called Media. Note: If only one of the two (Autoplay or Protected Content)
is visible, the one that is visible shows up on the main Site Settings menu
instead (no point in having a sub-menu with only one item).

BUG=604753
==========

[Theresa, 2016-05-12 16:38:40]

lgtm

[Theresa, 2016-05-12 16:46:07]

If the experiment launches, I think it probably makes sense to make
MediaSettingsPreferences.java it's own class. But for now, since sometimes the
menu items are in regular site settings and sometimes they're in the submenu
having one SiteSettingsPreferences class makes sense.

[gone, 2016-05-12 17:10:35]

OWNERS lgtm

https://codereview.chromium.org/1972963002/diff/40001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
(right):

https://codereview.chromium.org/1972963002/diff/40001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java:29:
* submenu, which contains Autoplay and Protected Content. To avoid the Media
sub-menu having only
nit: Be consistent with sub-menu and sub-item vs submenu

https://codereview.chromium.org/1972963002/diff/40001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java:158:
// When showing the main menu, only one of these two will be visible, at most.
nit: This implies an else if, doesn't it?

[Finnur, 2016-05-12 20:58:53]

Thanks for the review! Checking in.

https://codereview.chromium.org/1972963002/diff/40001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
(right):

https://codereview.chromium.org/1972963002/diff/40001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java:29:
* submenu, which contains Autoplay and Protected Content. To avoid the Media
sub-menu having only
On 2016/05/12 17:10:35, dfalcantara wrote:
> nit: Be consistent with sub-menu and sub-item vs submenu

Done.

https://codereview.chromium.org/1972963002/diff/40001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java:158:
// When showing the main menu, only one of these two will be visible, at most.
Sure. Done.

[Finnur, 2016-05-12 20:59:05]

The CQ bit was checked by finnur@chromium.org

[Finnur, 2016-05-12 20:59:06]

The patchset sent to the CQ was uploaded after l-g-t-m from
twellington@chromium.org, dfalcantara@chromium.org
Link to the patchset: https://codereview.chromium.org/1972963002/#ps60001
(title: "Address feedback")

[commit-bot: I haz the power, 2016-05-12 20:59:23]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1972963002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1972963002/60001

[commit-bot: I haz the power, 2016-05-12 21:46:31]

Description was changed from

==========
Site Settings Android: Move Autoplay and Protected Content to Media menu.

This moves the Autoplay and Protected Content permissions under a sub-menu
called Media. Note: If only one of the two (Autoplay or Protected Content)
is visible, the one that is visible shows up on the main Site Settings menu
instead (no point in having a sub-menu with only one item).

BUG=604753
==========

to

==========
Site Settings Android: Move Autoplay and Protected Content to Media menu.

This moves the Autoplay and Protected Content permissions under a sub-menu
called Media. Note: If only one of the two (Autoplay or Protected Content)
is visible, the one that is visible shows up on the main Site Settings menu
instead (no point in having a sub-menu with only one item).

BUG=604753
==========

[commit-bot: I haz the power, 2016-05-12 21:46:32]

Committed patchset #3 (id:60001)

[commit-bot: I haz the power, 2016-05-12 21:47:38]

Description was changed from

==========
Site Settings Android: Move Autoplay and Protected Content to Media menu.

This moves the Autoplay and Protected Content permissions under a sub-menu
called Media. Note: If only one of the two (Autoplay or Protected Content)
is visible, the one that is visible shows up on the main Site Settings menu
instead (no point in having a sub-menu with only one item).

BUG=604753
==========

to

==========
Site Settings Android: Move Autoplay and Protected Content to Media menu.

This moves the Autoplay and Protected Content permissions under a sub-menu
called Media. Note: If only one of the two (Autoplay or Protected Content)
is visible, the one that is visible shows up on the main Site Settings menu
instead (no point in having a sub-menu with only one item).

BUG=604753

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

[commit-bot: I haz the power, 2016-05-12 21:47:39]

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