diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 23:14:06 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 23:14:06 +0000 |
| commit | e098ce874e942a11083116f848310d026e8c37c8 (patch) | |
| tree | 2064da56bfc191fc7b93cb12feae8768dffd3d71 /chrome/browser/sync/notifier | |
| parent | 154a9820511c94bdcc8a69a3f7cc69b56ea75cd1 (diff) | |
| download | chromium_src-e098ce874e942a11083116f848310d026e8c37c8.zip chromium_src-e098ce874e942a11083116f848310d026e8c37c8.tar.gz chromium_src-e098ce874e942a11083116f848310d026e8c37c8.tar.bz2 | |
Rename "xmpp/constants.*" to" xmpp/xmppconstants.*"
The intent is to fix a link error that seems to happen when two
compilation units share a filename: there is another constants.cc in
p2p/base. Touch xmppconstants.h to work around a git cl upload bug.
Review URL: http://codereview.chromium.org/244010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/notifier')
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/sync/notifier/communicator/single_login_attempt.cc b/chrome/browser/sync/notifier/communicator/single_login_attempt.cc index fe25e8c..04bd31a 100644 --- a/chrome/browser/sync/notifier/communicator/single_login_attempt.cc +++ b/chrome/browser/sync/notifier/communicator/single_login_attempt.cc @@ -20,10 +20,10 @@ #include "talk/base/signalthread.h" #include "talk/base/taskrunner.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmpp/constants.h" #include "talk/xmpp/prexmppauth.h" #include "talk/xmpp/xmppclient.h" #include "talk/xmpp/xmppclientsettings.h" +#include "talk/xmpp/xmppconstants.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/gaia_auth/gaiahelper.cc b/chrome/browser/sync/notifier/gaia_auth/gaiahelper.cc index 95ca023..9d5f4eb 100644 --- a/chrome/browser/sync/notifier/gaia_auth/gaiahelper.cc +++ b/chrome/browser/sync/notifier/gaia_auth/gaiahelper.cc @@ -9,8 +9,8 @@ #include "talk/base/httpcommon-inl.h" #include "talk/base/stringutils.h" #include "talk/base/urlencode.h" -#include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" +#include "talk/xmpp/xmppconstants.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/sync/notifier/listener/listen_task.cc b/chrome/browser/sync/notifier/listener/listen_task.cc index 79d0327..70fd081 100644 --- a/chrome/browser/sync/notifier/listener/listen_task.cc +++ b/chrome/browser/sync/notifier/listener/listen_task.cc @@ -9,8 +9,8 @@ #include "talk/base/task.h" #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmpp/constants.h" #include "talk/xmpp/xmppclient.h" +#include "talk/xmpp/xmppconstants.h" #include "talk/xmpp/xmppengine.h" namespace browser_sync { diff --git a/chrome/browser/sync/notifier/listener/send_update_task.cc b/chrome/browser/sync/notifier/listener/send_update_task.cc index 45c54fd..835b226 100644 --- a/chrome/browser/sync/notifier/listener/send_update_task.cc +++ b/chrome/browser/sync/notifier/listener/send_update_task.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "talk/xmllite/qname.h" -#include "talk/xmpp/constants.h" #include "talk/xmpp/xmppclient.h" +#include "talk/xmpp/xmppconstants.h" namespace browser_sync { diff --git a/chrome/browser/sync/notifier/listener/subscribe_task.cc b/chrome/browser/sync/notifier/listener/subscribe_task.cc index 1a663041..9fb828b 100644 --- a/chrome/browser/sync/notifier/listener/subscribe_task.cc +++ b/chrome/browser/sync/notifier/listener/subscribe_task.cc @@ -10,8 +10,8 @@ #include "talk/base/task.h" #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmpp/constants.h" #include "talk/xmpp/xmppclient.h" +#include "talk/xmpp/xmppconstants.h" #include "talk/xmpp/xmppengine.h" namespace browser_sync { |