jingle/notifier/listener/talk_mediator_impl.h - Issue 2885005: Move chrome/common/net/notifier to jingle/notifier so that it can be used by remoting/remoting.gyp.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: jingle/notifier/listener/talk_mediator_impl.h

Issue 2885005: Move chrome/common/net/notifier to jingle/notifier so that it can be used by remoting/remoting.gyp. (Closed) Base URL: git://codf21.jail.google.com/chromium.git

Patch Set: rebased Created 10 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: jingle/notifier/listener/talk_mediator_impl.h

diff --git a/chrome/common/net/notifier/listener/talk_mediator_impl.h b/jingle/notifier/listener/talk_mediator_impl.h

similarity index 90%

rename from chrome/common/net/notifier/listener/talk_mediator_impl.h

rename to jingle/notifier/listener/talk_mediator_impl.h

index e14840fbfdc52c3932c68147bce12da20e50a170..e6fc988df0e0d2bdc44214dbbe288fa71fc9aca8 100644

--- a/chrome/common/net/notifier/listener/talk_mediator_impl.h

+++ b/jingle/notifier/listener/talk_mediator_impl.h

@@ -6,16 +6,16 @@

// It will manage all aspects of the connection and call back into the client

// when it needs attention (for instance if updates are available for syncing).

-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_

-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_

+#ifndef JINGLE_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_

+#define JINGLE_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_

#include <string>

#include <vector>

#include "base/non_thread_safe.h"

#include "base/scoped_ptr.h"

-#include "chrome/common/net/notifier/listener/mediator_thread.h"

-#include "chrome/common/net/notifier/listener/talk_mediator.h"

+#include "jingle/notifier/listener/mediator_thread.h"

+#include "jingle/notifier/listener/talk_mediator.h"

#include "talk/base/sigslot.h"

#include "talk/xmpp/xmppclientsettings.h"

#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST

@@ -101,4 +101,4 @@ class TalkMediatorImpl

} // namespace notifier

-#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_

+#endif // JINGLE_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_

« no previous file with comments | « jingle/notifier/listener/talk_mediator.h ('k') | jingle/notifier/listener/talk_mediator_impl.cc » ('j') | no next file with comments »