Index: tools/telemetry/docs/telemetry.core.browser_options.html |
diff --git a/tools/telemetry/docs/telemetry.core.browser_options.html b/tools/telemetry/docs/telemetry.core.browser_options.html |
index 66443051bed2b8883c09473da99bceeb85416aaa..15914e3972947dff73060b6e8fd5abec68149478 100644 |
--- a/tools/telemetry/docs/telemetry.core.browser_options.html |
+++ b/tools/telemetry/docs/telemetry.core.browser_options.html |
@@ -22,13 +22,17 @@ |
<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="telemetry.core.browser_finder.html">telemetry.core.browser_finder</a><br> |
<a href="copy.html">copy</a><br> |
<a href="logging.html">logging</a><br> |
+<a href="net_configs.html">net_configs</a><br> |
</td><td width="25%" valign=top><a href="optparse.html">optparse</a><br> |
+<a href="os.html">os</a><br> |
<a href="telemetry.core.profile_types.html">telemetry.core.profile_types</a><br> |
<a href="telemetry.core.platform.profiler.profiler_finder.html">telemetry.core.platform.profiler.profiler_finder</a><br> |
-</td><td width="25%" valign=top><a href="shlex.html">shlex</a><br> |
+</td><td width="25%" valign=top><a href="telemetry.core.repeat_options.html">telemetry.core.repeat_options</a><br> |
+<a href="shlex.html">shlex</a><br> |
<a href="sys.html">sys</a><br> |
-<a href="telemetry.core.wpr_modes.html">telemetry.core.wpr_modes</a><br> |
-</td><td width="25%" valign=top></td></tr></table></td></tr></table><p> |
+<a href="telemetry.core.util.html">telemetry.core.util</a><br> |
+</td><td width="25%" valign=top><a href="telemetry.core.wpr_modes.html">telemetry.core.wpr_modes</a><br> |
+</td></tr></table></td></tr></table><p> |
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> |
<tr bgcolor="#ee77aa"> |
<td colspan=3 valign=bottom> <br> |
@@ -36,44 +40,82 @@ |
<tr><td bgcolor="#ee77aa"><tt> </tt></td><td> </td> |
<td width="100%"><dl> |
-<dt><font face="helvetica, arial"><a href="optparse.html#Values">optparse.Values</a> |
+<dt><font face="helvetica, arial"><a href="__builtin__.html#object">__builtin__.object</a> |
</font></dt><dd> |
<dl> |
<dt><font face="helvetica, arial"><a href="telemetry.core.browser_options.html#BrowserOptions">BrowserOptions</a> |
</font></dt></dl> |
</dd> |
+<dt><font face="helvetica, arial"><a href="optparse.html#Values">optparse.Values</a> |
+</font></dt><dd> |
+<dl> |
+<dt><font face="helvetica, arial"><a href="telemetry.core.browser_options.html#BrowserFinderOptions">BrowserFinderOptions</a> |
+</font></dt></dl> |
+</dd> |
</dl> |
<p> |
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> |
<tr bgcolor="#ffc8d8"> |
<td colspan=3 valign=bottom> <br> |
-<font color="#000000" face="helvetica, arial"><a name="BrowserOptions">class <strong>BrowserOptions</strong></a>(<a href="optparse.html#Values">optparse.Values</a>)</font></td></tr> |
+<font color="#000000" face="helvetica, arial"><a name="BrowserFinderOptions">class <strong>BrowserFinderOptions</strong></a>(<a href="optparse.html#Values">optparse.Values</a>)</font></td></tr> |
<tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> |
-<td colspan=2><tt>Options to be used for discovering and launching a browser.<br> </tt></td></tr> |
+<td colspan=2><tt>Options to be used for discovering a browser.<br> </tt></td></tr> |
<tr><td> </td> |
<td width="100%">Methods defined here:<br> |
-<dl><dt><a name="BrowserOptions-AppendExtraBrowserArg"><strong>AppendExtraBrowserArg</strong></a>(self, arg)</dt></dl> |
+<dl><dt><a name="BrowserFinderOptions-AppendExtraBrowserArgs"><strong>AppendExtraBrowserArgs</strong></a>(self, args)</dt></dl> |
-<dl><dt><a name="BrowserOptions-Copy"><strong>Copy</strong></a>(self)</dt></dl> |
+<dl><dt><a name="BrowserFinderOptions-Copy"><strong>Copy</strong></a>(self)</dt></dl> |
-<dl><dt><a name="BrowserOptions-CreateParser"><strong>CreateParser</strong></a>(self, *args, **kwargs)</dt></dl> |
+<dl><dt><a name="BrowserFinderOptions-CreateParser"><strong>CreateParser</strong></a>(self, *args, **kwargs)</dt></dl> |
-<dl><dt><a name="BrowserOptions-__init__"><strong>__init__</strong></a>(self, browser_type<font color="#909090">=None</font>)</dt></dl> |
+<dl><dt><a name="BrowserFinderOptions-MergeDefaultValues"><strong>MergeDefaultValues</strong></a>(self, defaults)</dt></dl> |
+ |
+<dl><dt><a name="BrowserFinderOptions-__init__"><strong>__init__</strong></a>(self, browser_type<font color="#909090">=None</font>)</dt></dl> |
<hr> |
Methods inherited from <a href="optparse.html#Values">optparse.Values</a>:<br> |
-<dl><dt><a name="BrowserOptions-__cmp__"><strong>__cmp__</strong></a>(self, other)</dt></dl> |
+<dl><dt><a name="BrowserFinderOptions-__cmp__"><strong>__cmp__</strong></a>(self, other)</dt></dl> |
-<dl><dt><a name="BrowserOptions-__repr__"><strong>__repr__</strong></a> = _repr(self)</dt></dl> |
+<dl><dt><a name="BrowserFinderOptions-__repr__"><strong>__repr__</strong></a> = _repr(self)</dt></dl> |
-<dl><dt><a name="BrowserOptions-__str__"><strong>__str__</strong></a>(self)</dt></dl> |
+<dl><dt><a name="BrowserFinderOptions-__str__"><strong>__str__</strong></a>(self)</dt></dl> |
-<dl><dt><a name="BrowserOptions-ensure_value"><strong>ensure_value</strong></a>(self, attr, value)</dt></dl> |
+<dl><dt><a name="BrowserFinderOptions-ensure_value"><strong>ensure_value</strong></a>(self, attr, value)</dt></dl> |
-<dl><dt><a name="BrowserOptions-read_file"><strong>read_file</strong></a>(self, filename, mode<font color="#909090">='careful'</font>)</dt></dl> |
+<dl><dt><a name="BrowserFinderOptions-read_file"><strong>read_file</strong></a>(self, filename, mode<font color="#909090">='careful'</font>)</dt></dl> |
-<dl><dt><a name="BrowserOptions-read_module"><strong>read_module</strong></a>(self, modname, mode<font color="#909090">='careful'</font>)</dt></dl> |
+<dl><dt><a name="BrowserFinderOptions-read_module"><strong>read_module</strong></a>(self, modname, mode<font color="#909090">='careful'</font>)</dt></dl> |
+</td></tr></table> <p> |
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> |
+<tr bgcolor="#ffc8d8"> |
+<td colspan=3 valign=bottom> <br> |
+<font color="#000000" face="helvetica, arial"><a name="BrowserOptions">class <strong>BrowserOptions</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr> |
+ |
+<tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> |
+<td colspan=2><tt>Options to be used for launching a browser.<br> </tt></td></tr> |
+<tr><td> </td> |
+<td width="100%">Methods defined here:<br> |
+<dl><dt><a name="BrowserOptions-AppendExtraBrowserArgs"><strong>AppendExtraBrowserArgs</strong></a>(self, args)</dt></dl> |
+ |
+<dl><dt><a name="BrowserOptions-UpdateFromParseResults"><strong>UpdateFromParseResults</strong></a>(self, finder_options)</dt><dd><tt>Copies our options from finder_options</tt></dd></dl> |
+ |
+<dl><dt><a name="BrowserOptions-__init__"><strong>__init__</strong></a>(self)</dt></dl> |
+ |
+<hr> |
+Class methods defined here:<br> |
+<dl><dt><a name="BrowserOptions-AddCommandLineArgs"><strong>AddCommandLineArgs</strong></a>(cls, parser)<font color="#909090"><font face="helvetica, arial"> from <a href="__builtin__.html#type">__builtin__.type</a></font></font></dt></dl> |
+ |
+<hr> |
+Data descriptors defined here:<br> |
+<dl><dt><strong>__dict__</strong></dt> |
+<dd><tt>dictionary for instance variables (if defined)</tt></dd> |
+</dl> |
+<dl><dt><strong>__weakref__</strong></dt> |
+<dd><tt>list of weak references to the object (if defined)</tt></dd> |
+</dl> |
+<dl><dt><strong>extra_browser_args</strong></dt> |
+</dl> |
</td></tr></table></td></tr></table> |
</body></html> |