summaryrefslogtreecommitdiffstats
path: root/chrome/browser/visitedlink_master.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 02:48:27 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 02:48:27 +0000
commit4bcac78e6c353cd9823f559dc8c6181e824e88ce (patch)
treee14c602e6c08c3d817f4684604b4f35b17c7a27d /chrome/browser/visitedlink_master.cc
parent4dfabc88767a14cb40b7b96ac1e1f1912f03391c (diff)
downloadchromium_src-4bcac78e6c353cd9823f559dc8c6181e824e88ce.zip
chromium_src-4bcac78e6c353cd9823f559dc8c6181e824e88ce.tar.gz
chromium_src-4bcac78e6c353cd9823f559dc8c6181e824e88ce.tar.bz2
Revert basically everything I've done today as it fails mysteriously
and I lack the patience to diagnose why mac doesn't link in libjpeg. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/visitedlink_master.cc')
-rw-r--r--chrome/browser/visitedlink_master.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/visitedlink_master.cc b/chrome/browser/visitedlink_master.cc
index 8baf4a3..e24f80c 100644
--- a/chrome/browser/visitedlink_master.cc
+++ b/chrome/browser/visitedlink_master.cc
@@ -23,9 +23,14 @@
#include "base/string_util.h"
#include "base/thread.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/history/history.h"
#include "chrome/browser/profile.h"
-
+#if defined(OS_WIN)
+#include "chrome/browser/history/history.h"
+#else
+// TODO(port): We should be using history.h, remove scaffolding
+// when it is ported.
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif // !defined(OS_WIN)
#if defined(OS_WIN)
#include "chrome/common/win_util.h"
#endif