telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.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/backends/chrome/chrome_browser_backend.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

« no previous file with comments | « telemetry/telemetry/internal/backends/chrome/android_browser_backend.py ('k') | telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py

diff --git a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py

index ce40ade44f6221c79fe5c5d8f62fbe6c92ff3438..317c9007bb3eba80b553048511f0fe91cb177a8d 100644

--- a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py

+++ b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py

@@ -116,9 +116,13 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):

if self.browser_options.disable_default_apps:

args.append('--disable-default-apps')

- if self.browser_options.enable_logging:

- args.append('--enable-logging')

- args.append('--v=1')

+ if (self.browser_options.logging_verbosity ==

+ self.browser_options.NON_VERBOSE_LOGGING):

+ args.extend(['--enable-logging', '--v=0'])

+ elif (self.browser_options.logging_verbosity ==

+ self.browser_options.VERBOSE_LOGGING):

+ args.extend(['--enable-logging', '--v=1'])

return args

def GetReplayBrowserStartupArgs(self):