| OLD | NEW |
| 1 <!DOCTYPE html><!-- This page is a placeholder for generated extensions api doc.
Note: | 1 <!DOCTYPE html><!-- This page is a placeholder for generated extensions api doc.
Note: |
| 2 1) The <head> information in this page is significant, should be uniform | 2 1) The <head> information in this page is significant, should be uniform |
| 3 across api docs and should be edited only with knowledge of the | 3 across api docs and should be edited only with knowledge of the |
| 4 templating mechanism. | 4 templating mechanism. |
| 5 3) All <body>.innerHTML is genereated as an rendering step. If viewed in a | 5 3) All <body>.innerHTML is genereated as an rendering step. If viewed in a |
| 6 browser, it will be re-generated from the template, json schema and | 6 browser, it will be re-generated from the template, json schema and |
| 7 authored overview content. | 7 authored overview content. |
| 8 4) The <body>.innerHTML is also generated by an offline step so that this | 8 4) The <body>.innerHTML is also generated by an offline step so that this |
| 9 page may easily be indexed by search engines. | 9 page may easily be indexed by search engines. |
| 10 --><html xmlns="http://www.w3.org/1999/xhtml"><head> | 10 --><html xmlns="http://www.w3.org/1999/xhtml"><head> |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 | 88 |
| 89 </div> <!-- /VALUE --> | 89 </div> <!-- /VALUE --> |
| 90 | 90 |
| 91 <div id="functionParametersTemplate"> | 91 <div id="functionParametersTemplate"> |
| 92 <h5>Parameters</h5> | 92 <h5>Parameters</h5> |
| 93 <dl> | 93 <dl> |
| 94 <div> | 94 <div> |
| 95 <div> | 95 <div> |
| 96 </div> | 96 </div> |
| 97 </div> | 97 </div> |
| 98 <<<<<<< HEAD |
| 98 </dl> | 99 </dl> |
| 100 ======= |
| 101 </dl> |
| 102 >>>>>>> All communication with the cloud print proxy service from the browser no
w happens in the CloudPrintProxyService class. Added code to start the service p
rocess if the cloud print proxy was enabled. Also, when detect an auto-update, w
e send an IPC to the service process. The service process then shuts down when t
he browser disconnects. |
| 99 </div> | 103 </div> |
| 100 </div> <!-- /SUBTEMPLATES --> | 104 </div> <!-- /SUBTEMPLATES --> |
| 101 | 105 |
| 102 <a id="top"></a> | 106 <a id="top"></a> |
| 103 <div id="skipto"> | 107 <div id="skipto"> |
| 104 <a href="#gc-pagecontent">Skip to page content</a> | 108 <a href="#gc-pagecontent">Skip to page content</a> |
| 105 <a href="#gc-toc">Skip to main navigation</a> | 109 <a href="#gc-toc">Skip to main navigation</a> |
| 106 </div> | 110 </div> |
| 107 <!-- API HEADER --> | 111 <!-- API HEADER --> |
| 108 <table id="header" width="100%" cellspacing="0" border="0"> | 112 <table id="header" width="100%" cellspacing="0" border="0"> |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 <!-- <li>Packages (.crx)</li> --> | 223 <!-- <li>Packages (.crx)</li> --> |
| 220 </ul> | 224 </ul> |
| 221 </li> | 225 </li> |
| 222 <li><a href="api_index.html">chrome.* APIs</a></li> | 226 <li><a href="api_index.html">chrome.* APIs</a></li> |
| 223 <li><a href="api_other.html">Other APIs</a></li> | 227 <li><a href="api_other.html">Other APIs</a></li> |
| 224 </ul> | 228 </ul> |
| 225 </li> | 229 </li> |
| 226 <li><h2><a href="samples.html">Samples</a></h2></li> | 230 <li><h2><a href="samples.html">Samples</a></h2></li> |
| 227 </ul> | 231 </ul> |
| 228 </div> | 232 </div> |
| 233 <<<<<<< HEAD |
| 229 <script> | 234 <script> |
| 230 initToggles(); | 235 initToggles(); |
| 231 </script> | 236 </script> |
| 237 ======= |
| 238 >>>>>>> All communication with the cloud print proxy service from the browser no
w happens in the CloudPrintProxyService class. Added code to start the service p
rocess if the cloud print proxy was enabled. Also, when detect an auto-update, w
e send an IPC to the service process. The service process then shuts down when t
he browser disconnects. |
| 232 | 239 |
| 233 <div class="g-unit" id="gc-pagecontent"> | 240 <div class="g-unit" id="gc-pagecontent"> |
| 234 <div id="pageTitle"> | 241 <div id="pageTitle"> |
| 235 <h1 class="page_title">Permission Warnings</h1> | 242 <h1 class="page_title">Permission Warnings</h1> |
| 236 </div> | 243 </div> |
| 237 <!-- TABLE OF CONTENTS --> | 244 <!-- TABLE OF CONTENTS --> |
| 238 <div id="toc"> | 245 <div id="toc"> |
| 239 <h2>Contents</h2> | 246 <h2>Contents</h2> |
| 240 <ol> | 247 <ol> |
| 241 <li> | 248 <li> |
| (...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 _uff=0; | 810 _uff=0; |
| 804 urchinTracker(); | 811 urchinTracker(); |
| 805 } | 812 } |
| 806 catch(e) {/* urchinTracker not available. */} | 813 catch(e) {/* urchinTracker not available. */} |
| 807 </script> | 814 </script> |
| 808 <!-- end analytics --> | 815 <!-- end analytics --> |
| 809 </div> | 816 </div> |
| 810 </div> <!-- /gc-footer --> | 817 </div> <!-- /gc-footer --> |
| 811 </div> <!-- /gc-container --> | 818 </div> <!-- /gc-container --> |
| 812 </body></html> | 819 </body></html> |
| OLD | NEW |