summaryrefslogtreecommitdiffstats
path: root/ios/public
diff options
context:
space:
mode:
authorvabr <vabr@chromium.org>2015-11-27 02:59:19 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-27 11:00:05 +0000
commit7a6f62ee3328bc717d433f5c3a2cc7b937ef79e3 (patch)
tree832c585f9fdc85f5ff94e5c64513820efea55c1d /ios/public
parente8cef80cb86a9da6ddbb660d3f547f43ea09cd68 (diff)
downloadchromium_src-7a6f62ee3328bc717d433f5c3a2cc7b937ef79e3.zip
chromium_src-7a6f62ee3328bc717d433f5c3a2cc7b937ef79e3.tar.gz
chromium_src-7a6f62ee3328bc717d433f5c3a2cc7b937ef79e3.tar.bz2
Introduce IOSChromeSyncClient (upstream)
This is the upstream part of the downstream CL 307417013. BUG=544795, 548612, 453435 Review URL: https://codereview.chromium.org/1471073006 Cr-Commit-Position: refs/heads/master@{#361976}
Diffstat (limited to 'ios/public')
-rw-r--r--ios/public/provider/chrome/browser/chrome_browser_provider.cc8
-rw-r--r--ios/public/provider/chrome/browser/chrome_browser_provider.h9
2 files changed, 16 insertions, 1 deletions
diff --git a/ios/public/provider/chrome/browser/chrome_browser_provider.cc b/ios/public/provider/chrome/browser/chrome_browser_provider.cc
index 9435b17..a12824c 100644
--- a/ios/public/provider/chrome/browser/chrome_browser_provider.cc
+++ b/ios/public/provider/chrome/browser/chrome_browser_provider.cc
@@ -9,9 +9,9 @@
#include "base/logging.h"
#include "components/metrics/metrics_provider.h"
#include "components/sync_sessions/local_session_event_router.h"
+#include "components/sync_sessions/synced_window_delegates_getter.h"
#include "ios/public/provider/chrome/browser/browsing_data/ios_chrome_browsing_data_remover_provider.h"
#include "ios/public/provider/chrome/browser/keyed_service_provider.h"
-#include "ios/public/provider/chrome/browser/keyed_service_provider.h"
namespace ios {
@@ -132,4 +132,10 @@ bool ChromeBrowserProvider::IsSafeBrowsingEnabled(
void ChromeBrowserProvider::OnMetricsServicesManagerClientDestroyed() {}
+scoped_ptr<browser_sync::SyncedWindowDelegatesGetter>
+ChromeBrowserProvider::CreateSyncedWindowDelegatesGetter(
+ ios::ChromeBrowserState* browser_state) {
+ return nullptr;
+}
+
} // namespace ios
diff --git a/ios/public/provider/chrome/browser/chrome_browser_provider.h b/ios/public/provider/chrome/browser/chrome_browser_provider.h
index a557d91..470b3e4 100644
--- a/ios/public/provider/chrome/browser/chrome_browser_provider.h
+++ b/ios/public/provider/chrome/browser/chrome_browser_provider.h
@@ -11,6 +11,7 @@
#include <vector>
#include "base/callback_forward.h"
+#include "base/memory/scoped_ptr.h"
#include "components/favicon_base/favicon_callback.h"
class AutocompleteProvider;
@@ -25,6 +26,10 @@ class CardUnmaskPromptController;
class CardUnmaskPromptView;
}
+namespace browser_sync {
+class SyncedWindowDelegatesGetter;
+}
+
namespace net {
class URLRequestContextGetter;
}
@@ -130,6 +135,10 @@ class ChromeBrowserProvider {
// Called when the IOSChromeMetricsServiceClientManager instance is
// destroyed.
virtual void OnMetricsServicesManagerClientDestroyed();
+
+ // Returns the SyncedWindowDelegatesGetter implementation.
+ virtual scoped_ptr<browser_sync::SyncedWindowDelegatesGetter>
+ CreateSyncedWindowDelegatesGetter(ios::ChromeBrowserState* browser_state);
};
} // namespace ios