summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/api/OWNERS1
-rw-r--r--chrome/browser/api/bookmarks/OWNERS2
-rw-r--r--chrome/browser/api/bookmarks/bookmark_service.h (renamed from chrome/browser/bookmarks/bookmark_service.h)6
-rw-r--r--chrome/browser/bookmarks/bookmark_model.h2
-rw-r--r--chrome/browser/history/DEPS1
-rw-r--r--chrome/browser/history/android/android_provider_backend.cc4
-rw-r--r--chrome/browser/history/android/android_provider_backend_unittest.cc4
-rw-r--r--chrome/browser/history/android/bookmark_model_sql_handler.cc2
-rw-r--r--chrome/browser/history/expire_history_backend.cc2
-rw-r--r--chrome/browser/history/history_backend.cc2
-rw-r--r--chrome/chrome_browser.gypi2
11 files changed, 15 insertions, 13 deletions
diff --git a/chrome/browser/api/OWNERS b/chrome/browser/api/OWNERS
index 4975363..be8c6dc 100644
--- a/chrome/browser/api/OWNERS
+++ b/chrome/browser/api/OWNERS
@@ -1 +1,2 @@
+erikwright@chromium.org
joi@chromium.org
diff --git a/chrome/browser/api/bookmarks/OWNERS b/chrome/browser/api/bookmarks/OWNERS
new file mode 100644
index 0000000..b221410
--- /dev/null
+++ b/chrome/browser/api/bookmarks/OWNERS
@@ -0,0 +1,2 @@
+brettw@chromium.org
+sky@chromium.org
diff --git a/chrome/browser/bookmarks/bookmark_service.h b/chrome/browser/api/bookmarks/bookmark_service.h
index 5a162e8..503ca75 100644
--- a/chrome/browser/bookmarks/bookmark_service.h
+++ b/chrome/browser/api/bookmarks/bookmark_service.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_SERVICE_H_
-#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_SERVICE_H_
+#ifndef CHROME_BROWSER_API_BOOKMARKS_BOOKMARK_SERVICE_H_
+#define CHROME_BROWSER_API_BOOKMARKS_BOOKMARK_SERVICE_H_
#include <vector>
@@ -43,4 +43,4 @@ class BookmarkService {
virtual ~BookmarkService() {}
};
-#endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_SERVICE_H_
+#endif // CHROME_BROWSER_API_BOOKMARKS_BOOKMARK_SERVICE_H_
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 1f1f8ea..1da7c74 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -16,7 +16,7 @@
#include "base/string16.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
-#include "chrome/browser/bookmarks/bookmark_service.h"
+#include "chrome/browser/api/bookmarks/bookmark_service.h"
#include "chrome/browser/cancelable_request.h"
#include "chrome/browser/favicon/favicon_service.h"
#include "chrome/browser/history/history.h"
diff --git a/chrome/browser/history/DEPS b/chrome/browser/history/DEPS
index 1d7d51a..7b7cfff 100644
--- a/chrome/browser/history/DEPS
+++ b/chrome/browser/history/DEPS
@@ -21,7 +21,6 @@ include_rules = [
"!chrome/browser/bookmarks/bookmark_codec.h",
"!chrome/browser/bookmarks/bookmark_model.h",
"!chrome/browser/bookmarks/bookmark_model_factory.h",
- "!chrome/browser/bookmarks/bookmark_service.h",
"!chrome/browser/browser_process.h",
"!chrome/browser/cancelable_request.h",
"!chrome/browser/chromeos/login/existing_user_controller.h",
diff --git a/chrome/browser/history/android/android_provider_backend.cc b/chrome/browser/history/android/android_provider_backend.cc
index 60ed1e3..454a6df 100644
--- a/chrome/browser/history/android/android_provider_backend.cc
+++ b/chrome/browser/history/android/android_provider_backend.cc
@@ -5,8 +5,7 @@
#include "chrome/browser/history/android/android_provider_backend.h"
#include "base/i18n/case_conversion.h"
-#include "chrome/browser/bookmarks/bookmark_service.h"
-#include "chrome/common/chrome_notification_types.h"
+#include "chrome/browser/api/bookmarks/bookmark_service.h"
#include "chrome/browser/history/android/android_time.h"
#include "chrome/browser/history/android/android_urls_sql_handler.h"
#include "chrome/browser/history/android/bookmark_model_sql_handler.h"
@@ -16,6 +15,7 @@
#include "chrome/browser/history/history_backend.h"
#include "chrome/browser/history/history_database.h"
#include "chrome/browser/history/thumbnail_database.h"
+#include "chrome/common/chrome_notification_types.h"
#include "content/public/common/page_transition_types.h"
#include "sql/connection.h"
diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc
index 45ce3e9..2474a02 100644
--- a/chrome/browser/history/android/android_provider_backend_unittest.cc
+++ b/chrome/browser/history/android/android_provider_backend_unittest.cc
@@ -12,17 +12,17 @@
#include "base/scoped_temp_dir.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/api/bookmarks/bookmark_service.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/bookmarks/bookmark_service.h"
#include "chrome/browser/history/android/android_time.h"
#include "chrome/browser/history/history_backend.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_profile_manager.h"
#include "chrome/test/base/testing_profile.h"
+#include "chrome/test/base/testing_profile_manager.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_browser_thread.h"
diff --git a/chrome/browser/history/android/bookmark_model_sql_handler.cc b/chrome/browser/history/android/bookmark_model_sql_handler.cc
index 98e2460..35cdda3 100644
--- a/chrome/browser/history/android/bookmark_model_sql_handler.cc
+++ b/chrome/browser/history/android/bookmark_model_sql_handler.cc
@@ -5,9 +5,9 @@
#include "chrome/browser/history/android/bookmark_model_sql_handler.h"
#include "base/logging.h"
+#include "chrome/browser/api/bookmarks/bookmark_service.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/bookmarks/bookmark_service.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/history/url_database.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/history/expire_history_backend.cc b/chrome/browser/history/expire_history_backend.cc
index 9742b1a..7089a38 100644
--- a/chrome/browser/history/expire_history_backend.cc
+++ b/chrome/browser/history/expire_history_backend.cc
@@ -11,7 +11,7 @@
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/message_loop.h"
-#include "chrome/browser/bookmarks/bookmark_service.h"
+#include "chrome/browser/api/bookmarks/bookmark_service.h"
#include "chrome/browser/history/archived_database.h"
#include "chrome/browser/history/history_database.h"
#include "chrome/browser/history/history_notifications.h"
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index 60e191a..c9407bc 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -19,8 +19,8 @@
#include "base/string_util.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/api/bookmarks/bookmark_service.h"
#include "chrome/browser/autocomplete/history_url_provider.h"
-#include "chrome/browser/bookmarks/bookmark_service.h"
#include "chrome/browser/cancelable_request.h"
#include "chrome/browser/history/history_notifications.h"
#include "chrome/browser/history/history_publisher.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 78f60fb..9493ed7 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -129,6 +129,7 @@
'browser/android/process_utils.h',
'browser/android/tab_android.cc',
'browser/android/tab_android.h',
+ 'browser/api/bookmarks/bookmark_service.h',
'browser/api/infobars/confirm_infobar_delegate.cc',
'browser/api/infobars/confirm_infobar_delegate.h',
'browser/api/infobars/infobar_delegate.cc',
@@ -348,7 +349,6 @@
'browser/bookmarks/bookmark_node_data.h',
'browser/bookmarks/bookmark_pasteboard_helper_mac.h',
'browser/bookmarks/bookmark_pasteboard_helper_mac.mm',
- 'browser/bookmarks/bookmark_service.h',
'browser/bookmarks/bookmark_storage.cc',
'browser/bookmarks/bookmark_storage.h',
'browser/bookmarks/bookmark_utils.cc',
generated by cgit v1.1 at 2025-02-07 05:54:06 +0000