summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 10:32:04 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 10:32:04 +0000
commitd80033e69d9542605fed21da06601f8201da6618 (patch)
treea38c7f88776664f80679d181baf1c1ad266d857d /third_party
parent185046805f294b0294311d09a3fe75f52e4554d8 (diff)
downloadchromium_src-d80033e69d9542605fed21da06601f8201da6618.zip
chromium_src-d80033e69d9542605fed21da06601f8201da6618.tar.gz
chromium_src-d80033e69d9542605fed21da06601f8201da6618.tar.bz2
Made sync code build and pass unit tests on OS X.
Major changes: - Moved sync_setup_{flow,wizard} to sync directory. - Made browser_with_test_window_test compile on non-Windows platform. - Moved localized contents font util functions to app/. BUG=23073 TEST=trybot Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=29253 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=29255 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=29258 Review URL: http://codereview.chromium.org/279004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libjingle/files/talk/base/autodetectproxy.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/libjingle/files/talk/base/autodetectproxy.cc b/third_party/libjingle/files/talk/base/autodetectproxy.cc
index aa2feed..917c548 100644
--- a/third_party/libjingle/files/talk/base/autodetectproxy.cc
+++ b/third_party/libjingle/files/talk/base/autodetectproxy.cc
@@ -26,7 +26,7 @@
*/
#include "talk/base/autodetectproxy.h"
-#include "talk/base/httpcommon.h"
+#include "talk/base/httpcommon-inl.h"
#include "talk/xmpp/xmppclientsettings.h"
#include "talk/base/proxydetect.h"