diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 17:49:42 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 17:49:42 +0000 |
| commit | a9afddb80f3aa7703681e02f7161d040e77c7be7 (patch) | |
| tree | ca9620bc65703eb3e522eb357821063d54f1e14c /chrome/browser/search_engines/template_url_model.cc | |
| parent | 0ba380929a8e0bd1ccacbd4accf295c00f2bbe53 (diff) | |
| download | chromium_src-a9afddb80f3aa7703681e02f7161d040e77c7be7.zip chromium_src-a9afddb80f3aa7703681e02f7161d040e77c7be7.tar.gz chromium_src-a9afddb80f3aa7703681e02f7161d040e77c7be7.tar.bz2 | |
Porting in chrome/
- make following unit tests compile and pass on Linux:
browser/history/expire_history_backend_unittest.cc
browser/history/history_backend_unittest.cc
browser/history/history_querying_unittest.cc
browser/history/starred_url_database_unittest.cc
- #include cleanup (less #ifdefs, more explicit deps)
Review URL: http://codereview.chromium.org/21247
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines/template_url_model.cc')
| -rw-r--r-- | chrome/browser/search_engines/template_url_model.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc index 1262780..bfb9d43 100644 --- a/chrome/browser/search_engines/template_url_model.cc +++ b/chrome/browser/search_engines/template_url_model.cc @@ -11,6 +11,7 @@ #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" @@ -26,17 +27,6 @@ #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. |