chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarControlLayoutTest.java - Issue 2019573002: Permissions: Allow control of individual requests in media permission infobars

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarControlLayoutTest.java

Issue 2019573002: Permissions: Allow control of individual requests in media permission infobars (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Bracket nit Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateAlwaysPanel.java ('k') | chrome/browser/media/media_stream_devices_controller.h » ('j') | chrome/browser/media/media_stream_devices_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarControlLayoutTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarControlLayoutTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarControlLayoutTest.java

index a7d2b286949e40ca610f722f43b71136e427d5d7..86f226d119d6a5bff4ed575fb318efc338bddc9d 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarControlLayoutTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarControlLayoutTest.java

@@ -45,7 +45,7 @@ public class InfoBarControlLayoutTest extends InstrumentationTestCase {

InfoBarControlLayout layout = new InfoBarControlLayout(mContext);

layout.setLayoutParams(

new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));

- View smallSwitch = layout.addSwitch(0, "A", SWITCH_ID_1, false);

+ View smallSwitch = layout.addSwitch(0, 0, "A", SWITCH_ID_1, false);

// Trigger the measurement algorithm.

int parentWidthSpec =

@@ -84,11 +84,11 @@ public class InfoBarControlLayoutTest extends InstrumentationTestCase {

layout.setLayoutParams(

new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));

- View switch1 = layout.addSwitch(0, "A", SWITCH_ID_1, false);

- View switch2 = layout.addSwitch(0, "B", SWITCH_ID_2, false);

- View switch3 = layout.addSwitch(0, "C", SWITCH_ID_3, false);

- View switch4 = layout.addSwitch(0, "D", SWITCH_ID_4, false);

- View switch5 = layout.addSwitch(0, "E", SWITCH_ID_4, false);

+ View switch1 = layout.addSwitch(0, 0, "A", SWITCH_ID_1, false);

+ View switch2 = layout.addSwitch(0, 0, "B", SWITCH_ID_2, false);

+ View switch3 = layout.addSwitch(0, 0, "C", SWITCH_ID_3, false);

+ View switch4 = layout.addSwitch(0, 0, "D", SWITCH_ID_4, false);

+ View switch5 = layout.addSwitch(0, 0, "E", SWITCH_ID_4, false);

// Make the second control require the full layout width.

switch2.setMinimumWidth(INFOBAR_WIDTH);

@@ -150,7 +150,7 @@ public class InfoBarControlLayoutTest extends InstrumentationTestCase {

new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));

View view1 = layout.addMainMessage("A");

- View view2 = layout.addSwitch(0, "B", SWITCH_ID_2, false);

+ View view2 = layout.addSwitch(0, 0, "B", SWITCH_ID_2, false);

// Trigger the measurement algorithm.

int parentWidthSpec =