telemetry/telemetry/internal/actions/load_media.py - Issue 2162963002: [polymer] Merge of master into polymer10-migration

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: telemetry/telemetry/internal/actions/load_media.py

Issue 2162963002: [polymer] Merge of master into polymer10-migration (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration

Patch Set: Merge polymer10-migration int polymer10-merge Created 4 years, 5 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

Index: telemetry/telemetry/internal/actions/load_media.py

diff --git a/telemetry/telemetry/internal/actions/load_media.py b/telemetry/telemetry/internal/actions/load_media.py

index c746004132feccc6d3eb73389834f35bddaec05e..470a97352f90eb7a28ce0c1bc4edc1c7db4ceadb 100644

--- a/telemetry/telemetry/internal/actions/load_media.py

+++ b/telemetry/telemetry/internal/actions/load_media.py

@@ -5,6 +5,7 @@

from telemetry.core import exceptions

from telemetry.internal.actions import media_action

from telemetry.internal.actions import page_action

+from telemetry.internal.actions import utils

class LoadMediaAction(media_action.MediaAction):

@@ -21,7 +22,7 @@ class LoadMediaAction(media_action.MediaAction):

def WillRunAction(self, tab):

"""Load the JS code prior to running the action."""

super(LoadMediaAction, self).WillRunAction(tab)

- self.LoadJS(tab, 'load_media.js')

+ utils.InjectJavaScript(tab, 'load_media.js')

def RunAction(self, tab):

try:

« no previous file with comments | « telemetry/telemetry/internal/actions/key_event_unittest.py ('k') | telemetry/telemetry/internal/actions/loop.py » ('j') | no next file with comments »