Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2603)

Unified Diff: chrome/app/android/chrome_main_delegate_android.cc

Issue 1940443002: 📤 Upstream SafeBrowsingApiBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/app/android/chrome_main_delegate_android.cc
diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/android/chrome_main_delegate_android.cc
index 3f7d980c278e63e7979d78aca02db23d8ff50bd8..b2cadfe98396ab1d177afd5be8ab4687c88dd31f 100644
--- a/chrome/app/android/chrome_main_delegate_android.cc
+++ b/chrome/app/android/chrome_main_delegate_android.cc
@@ -21,6 +21,7 @@
#include "content/public/browser/browser_main_runner.h"
#if defined(SAFE_BROWSING_DB_REMOTE)
+#include "chrome/browser/android/safe_browsing/safe_browsing_api_handler_bridge.h"
#include "components/safe_browsing_db/safe_browsing_api_handler.h"
using safe_browsing::SafeBrowsingApiHandler;
#endif
@@ -45,7 +46,8 @@ ChromeMainDelegateAndroid::~ChromeMainDelegateAndroid() {
bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) {
#if defined(SAFE_BROWSING_DB_REMOTE)
- safe_browsing_api_handler_.reset(CreateSafeBrowsingApiHandler());
+ safe_browsing_api_handler_.reset(
+ new safe_browsing::SafeBrowsingApiHandlerBridge());
SafeBrowsingApiHandler::SetInstance(safe_browsing_api_handler_.get());
#endif
@@ -111,10 +113,3 @@ void ChromeMainDelegateAndroid::ProcessExiting(
SafeBrowsingApiHandler::SetInstance(nullptr);
#endif
}
-
-#if defined(SAFE_BROWSING_DB_REMOTE)
-SafeBrowsingApiHandler*
-ChromeMainDelegateAndroid::CreateSafeBrowsingApiHandler() {
- return nullptr;
-}
-#endif

Powered by Google App Engine
This is Rietveld 408576698