diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-10 02:48:27 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-10 02:48:27 +0000 |
| commit | 4bcac78e6c353cd9823f559dc8c6181e824e88ce (patch) | |
| tree | e14c602e6c08c3d817f4684604b4f35b17c7a27d /chrome/browser/search_engines | |
| parent | 4dfabc88767a14cb40b7b96ac1e1f1912f03391c (diff) | |
| download | chromium_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/search_engines')
| -rw-r--r-- | chrome/browser/search_engines/template_url_model.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc index bfb9d43..1262780 100644 --- a/chrome/browser/search_engines/template_url_model.cc +++ b/chrome/browser/search_engines/template_url_model.cc @@ -11,7 +11,6 @@ #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google_url_tracker.h" -#include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/search_engines/template_url.h" @@ -27,6 +26,17 @@ #include "unicode/rbbi.h" #include "unicode/uchar.h" +#if defined(OS_POSIX) +// TODO(port): get rid of this include. It's used just to provide declarations +// and stub definitions for classes we encouter during the porting effort. +#include "chrome/common/temp_scaffolding_stubs.h" +#endif + +// TODO(port): Get rid of this section and finish porting. +#if defined(OS_WIN) +#include "chrome/browser/history/history.h" +#endif + using base::Time; // String in the URL that is replaced by the search term. |