diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:43:08 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-19 14:47:02 +0000 |
| commit | d5335d37310036a1236ba3f4195afbdc55a85b5a (patch) | |
| tree | 08f7e49ebe9c88d0c70e3199b801e117b06059a0 /chrome/common/extensions | |
| parent | 513209b27ff55e2841eac0e4120199c23acce758 (diff) | |
| download | external_chromium-d5335d37310036a1236ba3f4195afbdc55a85b5a.zip external_chromium-d5335d37310036a1236ba3f4195afbdc55a85b5a.tar.gz external_chromium-d5335d37310036a1236ba3f4195afbdc55a85b5a.tar.bz2 | |
Merge Chromium at r65505: Fix conflicts.
build/build_config.h:
http://src.chromium.org/viewvc/chrome?view=rev&revision=63506
chrome/browser/autofill/personal_data_manager.h
chrome/browser/autofill/personal_data_manager.cc:
http://src.chromium.org/viewvc/chrome?view=rev&revision=65100
chrome/common/extensions/docs/permission_warnings.html:
Git got confused :/
net/base/host_resolver_impl.cc:
http://src.chromium.org/viewvc/chrome?view=rev&revision=64369
base/logging.cc:
http://src.chromium.org/viewvc/chrome?view=rev&revision=65062
base/message_loop.cc:
http://src.chromium.org/viewvc/chrome?view=rev&revision=64975
Change-Id: Ied0356824b26ad7e6fea14fdc56cebb73b8b2f2a
Diffstat (limited to 'chrome/common/extensions')
| -rw-r--r-- | chrome/common/extensions/docs/permission_warnings.html | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/common/extensions/docs/permission_warnings.html b/chrome/common/extensions/docs/permission_warnings.html index 4363047..22370e0 100644 --- a/chrome/common/extensions/docs/permission_warnings.html +++ b/chrome/common/extensions/docs/permission_warnings.html @@ -95,11 +95,7 @@ <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 --> @@ -230,12 +226,9 @@ <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"> |