summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/android
diff options
context:
space:
mode:
authorkaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-19 02:21:43 +0000
committerkaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-19 02:21:43 +0000
commit1414a00dd053ed41304f2d71c26f9edce925131b (patch)
treede23544b2f274a2eba97e40484c6bb8da2b30b22 /chrome/browser/history/android
parent63a338022ddd57e68a55f26c6d1d534970e6c9ad (diff)
downloadchromium_src-1414a00dd053ed41304f2d71c26f9edce925131b.zip
chromium_src-1414a00dd053ed41304f2d71c26f9edce925131b.tar.gz
chromium_src-1414a00dd053ed41304f2d71c26f9edce925131b.tar.bz2
Revert 157475 - Introduce chrome/browser/common directory and move url_database(and its dependencies).
c/b/common dir is for utility/library code shared by chrome browser code. BUG=144783 Review URL: https://chromiumcodereview.appspot.com/10908155 TBR=kaiwang@chromium.org Review URL: https://codereview.chromium.org/10941028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/android')
-rw-r--r--chrome/browser/history/android/android_history_types.h2
-rw-r--r--chrome/browser/history/android/bookmark_model_sql_handler.cc2
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"