diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 02:30:44 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 02:30:44 +0000 |
| commit | de4176698f43df498848c6f7caf9887373d37015 (patch) | |
| tree | b6663107022e08d9e1ac66c8e78ef307f02e2a11 /chrome/browser/sync | |
| parent | 5a73f90320926dfe831325b8dbc27c791fa250ec (diff) | |
| download | chromium_src-de4176698f43df498848c6f7caf9887373d37015.zip chromium_src-de4176698f43df498848c6f7caf9887373d37015.tar.gz chromium_src-de4176698f43df498848c6f7caf9887373d37015.tar.bz2 | |
Move chrome/common/net/notifier to jingle/notifier so that it can be used by remoting/remoting.gyp.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/2885005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/DEPS | 5 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/all_status.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/DEPS | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/server_notifier_thread.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/server_notifier_thread.h | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/tools/sync_listen_notifications.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/sync/tools/sync_tools.gyp | 2 |
10 files changed, 23 insertions, 15 deletions
diff --git a/chrome/browser/sync/DEPS b/chrome/browser/sync/DEPS new file mode 100644 index 0000000..570fa48 --- /dev/null +++ b/chrome/browser/sync/DEPS @@ -0,0 +1,5 @@ +include_rules = [ + # sync_notifier depends on the common jingle notifier classes. + "+jingle/notifier", +] + diff --git a/chrome/browser/sync/engine/all_status.cc b/chrome/browser/sync/engine/all_status.cc index 73f80b9..6bf37d7 100644 --- a/chrome/browser/sync/engine/all_status.cc +++ b/chrome/browser/sync/engine/all_status.cc @@ -17,7 +17,7 @@ #include "chrome/browser/sync/sessions/session_state.h" #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/common/deprecated/event_sys-inl.h" -#include "chrome/common/net/notifier/listener/talk_mediator.h" +#include "jingle/notifier/listener/talk_mediator.h" namespace browser_sync { diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index 7d70ebe..1fbb4ed 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -54,10 +54,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/deprecated/event_sys.h" #include "chrome/common/net/gaia/gaia_authenticator.h" -#include "chrome/common/net/notifier/listener/mediator_thread_impl.h" -#include "chrome/common/net/notifier/listener/notification_constants.h" -#include "chrome/common/net/notifier/listener/talk_mediator.h" -#include "chrome/common/net/notifier/listener/talk_mediator_impl.h" +#include "jingle/notifier/listener/mediator_thread_impl.h" +#include "jingle/notifier/listener/notification_constants.h" +#include "jingle/notifier/listener/talk_mediator.h" +#include "jingle/notifier/listener/talk_mediator_impl.h" #include "net/base/network_change_notifier.h" using browser_sync::AllStatus; diff --git a/chrome/browser/sync/engine/syncer_thread.cc b/chrome/browser/sync/engine/syncer_thread.cc index 01f35f6..1437dfd 100644 --- a/chrome/browser/sync/engine/syncer_thread.cc +++ b/chrome/browser/sync/engine/syncer_thread.cc @@ -22,7 +22,7 @@ #include "chrome/browser/sync/engine/syncer.h" #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/notifier/listener/notification_constants.h" +#include "jingle/notifier/listener/notification_constants.h" using std::priority_queue; using std::min; diff --git a/chrome/browser/sync/notifier/DEPS b/chrome/browser/sync/notifier/DEPS index 5125416..dd31bd4 100644 --- a/chrome/browser/sync/notifier/DEPS +++ b/chrome/browser/sync/notifier/DEPS @@ -1,6 +1,8 @@ include_rules = [ # sync_notifier depends on cacheinvalidation. "+google/cacheinvalidation", + # sync_notifier depends on the common jingle notifier classes. + "+jingle/notifier", # sync_notifier depends on the xmpp part of libjingle. "+talk/xmpp", ] diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc index dbc3d54..fea98fe 100644 --- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc +++ b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc @@ -7,8 +7,8 @@ #include "base/base64.h" #include "base/callback.h" #include "base/logging.h" -#include "chrome/common/net/notifier/listener/xml_element_util.h" #include "google/cacheinvalidation/invalidation-client.h" +#include "jingle/notifier/listener/xml_element_util.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/xmppclient.h" diff --git a/chrome/browser/sync/notifier/server_notifier_thread.cc b/chrome/browser/sync/notifier/server_notifier_thread.cc index 19b2f40..ce416eb 100644 --- a/chrome/browser/sync/notifier/server_notifier_thread.cc +++ b/chrome/browser/sync/notifier/server_notifier_thread.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "chrome/browser/sync/notifier/chrome_invalidation_client.h" -#include "chrome/common/net/notifier/listener/notification_defines.h" +#include "jingle/notifier/listener/notification_defines.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/server_notifier_thread.h b/chrome/browser/sync/notifier/server_notifier_thread.h index 97f5990..2f5ca1d 100644 --- a/chrome/browser/sync/notifier/server_notifier_thread.h +++ b/chrome/browser/sync/notifier/server_notifier_thread.h @@ -18,7 +18,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/sync/notifier/chrome_invalidation_client.h" #include "chrome/browser/sync/syncable/model_type.h" -#include "chrome/common/net/notifier/listener/mediator_thread_impl.h" +#include "jingle/notifier/listener/mediator_thread_impl.h" namespace sync_notifier { diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc index 7e5df7c..c8f89d5 100644 --- a/chrome/browser/sync/tools/sync_listen_notifications.cc +++ b/chrome/browser/sync/tools/sync_listen_notifications.cc @@ -18,11 +18,12 @@ #include "chrome/browser/sync/notifier/chrome_system_resources.h" #include "chrome/browser/sync/sync_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/notifier/base/task_pump.h" -#include "chrome/common/net/notifier/communicator/xmpp_socket_adapter.h" -#include "chrome/common/net/notifier/listener/listen_task.h" -#include "chrome/common/net/notifier/listener/notification_constants.h" -#include "chrome/common/net/notifier/listener/subscribe_task.h" +#include "google/cacheinvalidation/invalidation-client.h" +#include "jingle/notifier/base/task_pump.h" +#include "jingle/notifier/communicator/xmpp_socket_adapter.h" +#include "jingle/notifier/listener/listen_task.h" +#include "jingle/notifier/listener/notification_constants.h" +#include "jingle/notifier/listener/subscribe_task.h" #include "talk/base/cryptstring.h" #include "talk/base/logging.h" #include "talk/base/sigslot.h" diff --git a/chrome/browser/sync/tools/sync_tools.gyp b/chrome/browser/sync/tools/sync_tools.gyp index 124f116..6059ea8 100644 --- a/chrome/browser/sync/tools/sync_tools.gyp +++ b/chrome/browser/sync/tools/sync_tools.gyp @@ -21,8 +21,8 @@ 'dependencies': [ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/chrome/chrome.gyp:common_constants', - '<(DEPTH)/chrome/chrome.gyp:notifier', '<(DEPTH)/chrome/chrome.gyp:sync_notifier', + '<(DEPTH)/jingle/jingle.gyp:notifier', '<(DEPTH)/third_party/libjingle/libjingle.gyp:libjingle', ], }, |