diff options
| author | kaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 21:05:34 +0000 |
|---|---|---|
| committer | kaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 21:05:34 +0000 |
| commit | fea7fc532d1314a531e1c1185c906a7b05e3d257 (patch) | |
| tree | f8068b8a087d3c67782d405d3258abbb0da3f491 /chrome/browser/history/android | |
| parent | d0f852dfdd260443a3e98a86671711775af15286 (diff) | |
| download | chromium_src-fea7fc532d1314a531e1c1185c906a7b05e3d257.zip chromium_src-fea7fc532d1314a531e1c1185c906a7b05e3d257.tar.gz chromium_src-fea7fc532d1314a531e1c1185c906a7b05e3d257.tar.bz2 | |
Move url_databse back to history
As discussed inside browser components team and with jam@ and ben@, we
feel URLDatabase is not a commonly used class but an concept inside
history.
This CL does not revert c/b/common dir because there's still other code
inside (cancelable_request).
This reverts http://codereview.chromium.org/10948045/
This reverts commit a7228f6379b0981c7862498825f221c18263c882.
Conflicts:
chrome/browser/history/history.h
chrome/browser/history/history_backend.h
chrome/chrome_browser.gypi
BUG=
Review URL: https://codereview.chromium.org/11039010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/android')
| -rw-r--r-- | chrome/browser/history/android/android_history_types.h | 2 | ||||
| -rw-r--r-- | chrome/browser/history/android/bookmark_model_sql_handler.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/history/android/android_history_types.h b/chrome/browser/history/android/android_history_types.h index a385d6a..843f465 100644 --- a/chrome/browser/history/android/android_history_types.h +++ b/chrome/browser/history/android/android_history_types.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/common/url_database/template_url_id.h" +#include "chrome/browser/search_engines/template_url_id.h" #include "sql/statement.h" namespace sql { diff --git a/chrome/browser/history/android/bookmark_model_sql_handler.cc b/chrome/browser/history/android/bookmark_model_sql_handler.cc index 852caae..35cdda3 100644 --- a/chrome/browser/history/android/bookmark_model_sql_handler.cc +++ b/chrome/browser/history/android/bookmark_model_sql_handler.cc @@ -9,7 +9,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/common/url_database/url_database.h" +#include "chrome/browser/history/url_database.h" #include "chrome/browser/profiles/profile_manager.h" #include "content/public/browser/browser_thread.h" |