diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 23:34:23 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 23:34:23 +0000 |
| commit | c3ddba29664d91b8910489150171496b28355bbb (patch) | |
| tree | 7b0273861652a98310037d074041d40dfbd6fbca /chrome/common/extensions | |
| parent | 5000ade63130b45452cb1d0d67d1f92e77c3436f (diff) | |
| download | chromium_src-c3ddba29664d91b8910489150171496b28355bbb.zip chromium_src-c3ddba29664d91b8910489150171496b28355bbb.tar.gz chromium_src-c3ddba29664d91b8910489150171496b28355bbb.tar.bz2 | |
Chromoting: Rename ChromotocolConfig -> SessionConfig
BUG=none
TEST=build chrome, chromoting
Review URL: http://codereview.chromium.org/4446005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions')
| -rw-r--r-- | chrome/common/extensions/docs/permission_warnings.html | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/common/extensions/docs/permission_warnings.html b/chrome/common/extensions/docs/permission_warnings.html index 9a76294..4363047 100644 --- a/chrome/common/extensions/docs/permission_warnings.html +++ b/chrome/common/extensions/docs/permission_warnings.html @@ -95,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 --> @@ -226,9 +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"> |