diff options
Diffstat (limited to 'chrome/common/extensions/docs/permission_warnings.html')
| -rw-r--r-- | chrome/common/extensions/docs/permission_warnings.html | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/common/extensions/docs/permission_warnings.html b/chrome/common/extensions/docs/permission_warnings.html index ce53446..4363047 100644 --- a/chrome/common/extensions/docs/permission_warnings.html +++ b/chrome/common/extensions/docs/permission_warnings.html @@ -15,6 +15,7 @@ </script> <script type="text/javascript" src="js/api_page_generator.js"></script> <script type="text/javascript" src="js/bootstrap.js"></script> + <script type="text/javascript" src="js/sidebar.js"></script> <title>Permission Warnings - Google Chrome Extensions - Google Code</title></head> <body> <div id="gc-container" class="labs"> <div id="devModeWarning"> @@ -94,7 +95,11 @@ <div> </div> </div> +<<<<<<< HEAD + </dl> +======= </dl> +>>>>>>> All communication with the cloud print proxy service from the browser now happens in the CloudPrintProxyService class. Added code to start the service process if the cloud print proxy was enabled. Also, when detect an auto-update, we send an IPC to the service process. The service process then shuts down when the browser disconnects. </div> </div> <!-- /SUBTEMPLATES --> @@ -225,6 +230,12 @@ <li><h2><a href="samples.html">Samples</a></h2></li> </ul> </div> +<<<<<<< HEAD + <script> + initToggles(); + </script> +======= +>>>>>>> All communication with the cloud print proxy service from the browser now happens in the CloudPrintProxyService class. Added code to start the service process if the cloud print proxy was enabled. Also, when detect an auto-update, we send an IPC to the service process. The service process then shuts down when the browser disconnects. <div class="g-unit" id="gc-pagecontent"> <div id="pageTitle"> |