Commit 927b8799 authored by Marti Wong's avatar Marti Wong Committed by Commit Bot

Move synced_sessions_bridge.mm from ui/ntp/recent_tabs/ to ui/sync/

So that this class could be reused by bookmark_collection_view for
keeping track of the syncing status. (and in later CL, it will show
a loading spinner when bookmark is syncing.)

Bug: 696893
Change-Id: I370c91ad1f9815c6d3c70021939140478beaebcc
Reviewed-on: https://chromium-review.googlesource.com/567786
Commit-Queue: Marti Wong <martiw@chromium.org>
Reviewed-by: default avatarMihai Sardarescu <msarda@chromium.org>
Reviewed-by: default avatarJean-François Geyelin <jif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486218}
parent 29bcb7b6
...@@ -16,8 +16,6 @@ source_set("recent_tabs") { ...@@ -16,8 +16,6 @@ source_set("recent_tabs") {
"sessions_sync_user_state.h", "sessions_sync_user_state.h",
"synced_sessions.h", "synced_sessions.h",
"synced_sessions.mm", "synced_sessions.mm",
"synced_sessions_bridge.h",
"synced_sessions_bridge.mm",
] ]
deps = [ deps = [
"//base", "//base",
...@@ -40,6 +38,7 @@ source_set("recent_tabs") { ...@@ -40,6 +38,7 @@ source_set("recent_tabs") {
"//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/context_menu",
"//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp",
"//ios/chrome/browser/ui/ntp/recent_tabs/views", "//ios/chrome/browser/ui/ntp/recent_tabs/views",
"//ios/chrome/browser/ui/sync/",
"//ios/web", "//ios/web",
"//ui/base", "//ui/base",
"//url", "//url",
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "ios/chrome/browser/sync/sync_setup_service_factory.h" #include "ios/chrome/browser/sync/sync_setup_service_factory.h"
#import "ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_bridges.h" #import "ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_bridges.h"
#import "ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_table_view_controller.h" #import "ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_table_view_controller.h"
#import "ios/chrome/browser/ui/ntp/recent_tabs/synced_sessions_bridge.h" #import "ios/chrome/browser/ui/sync/synced_sessions_bridge.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support." #error "This file requires ARC support."
......
...@@ -11,16 +11,20 @@ source_set("sync") { ...@@ -11,16 +11,20 @@ source_set("sync") {
"sync_error_infobar_delegate.mm", "sync_error_infobar_delegate.mm",
"sync_util.h", "sync_util.h",
"sync_util.mm", "sync_util.mm",
"synced_sessions_bridge.h",
"synced_sessions_bridge.mm",
] ]
deps = [ deps = [
"//base", "//base",
"//components/browser_sync", "//components/browser_sync",
"//components/infobars/core", "//components/infobars/core",
"//components/signin/core/browser",
"//components/strings", "//components/strings",
"//components/sync", "//components/sync",
"//google_apis", "//google_apis",
"//ios/chrome/app/strings", "//ios/chrome/app/strings",
"//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state",
"//ios/chrome/browser/signin",
"//ios/chrome/browser/sync", "//ios/chrome/browser/sync",
"//ios/chrome/browser/tabs", "//ios/chrome/browser/tabs",
"//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/commands",
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_UI_NTP_RECENT_TABS_SYNCED_SESSIONS_BRIDGE_H_ #ifndef IOS_CHROME_BROWSER_UI_SYNC_SYNCED_SESSIONS_BRIDGE_H_
#define IOS_CHROME_BROWSER_UI_NTP_RECENT_TABS_SYNCED_SESSIONS_BRIDGE_H_ #define IOS_CHROME_BROWSER_UI_SYNC_SYNCED_SESSIONS_BRIDGE_H_
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "components/signin/core/browser/signin_manager_base.h" #include "components/signin/core/browser/signin_manager_base.h"
#include "components/sync/driver/sync_service_observer.h" #include "components/sync/driver/sync_service_observer.h"
#import "ios/chrome/browser/sync/sync_observer_bridge.h" #import "ios/chrome/browser/sync/sync_observer_bridge.h"
#import "ios/chrome/browser/ui/ntp/recent_tabs/synced_sessions_bridge.h" #import "ios/chrome/browser/ui/sync/synced_sessions_bridge.h"
namespace ios { namespace ios {
class ChromeBrowserState; class ChromeBrowserState;
...@@ -59,4 +59,4 @@ class SyncedSessionsObserverBridge : public SyncObserverBridge, ...@@ -59,4 +59,4 @@ class SyncedSessionsObserverBridge : public SyncObserverBridge,
} // namespace synced_sessions } // namespace synced_sessions
#endif // IOS_CHROME_BROWSER_UI_NTP_RECENT_TABS_SYNCED_SESSIONS_BRIDGE_H_ #endif // IOS_CHROME_BROWSER_UI_SYNC_SYNCED_SESSIONS_BRIDGE_H_
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import "ios/chrome/browser/ui/ntp/recent_tabs/synced_sessions_bridge.h" #import "ios/chrome/browser/ui/sync/synced_sessions_bridge.h"
#include "components/browser_sync/profile_sync_service.h" #include "components/browser_sync/profile_sync_service.h"
#include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/browser/signin_manager.h"
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/signin/signin_manager_factory.h" #include "ios/chrome/browser/signin/signin_manager_factory.h"
#include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h" #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h"
#import "ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_table_view_controller.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support." #error "This file requires ARC support."
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "base/mac/scoped_nsobject.h" #include "base/mac/scoped_nsobject.h"
#import "ios/chrome/browser/tabs/tab_model_observer.h" #import "ios/chrome/browser/tabs/tab_model_observer.h"
#import "ios/chrome/browser/ui/ntp/recent_tabs/synced_sessions.h" #import "ios/chrome/browser/ui/ntp/recent_tabs/synced_sessions.h"
#import "ios/chrome/browser/ui/ntp/recent_tabs/synced_sessions_bridge.h" #import "ios/chrome/browser/ui/sync/synced_sessions_bridge.h"
#import "ios/chrome/browser/ui/tab_switcher/tab_model_snapshot.h" #import "ios/chrome/browser/ui/tab_switcher/tab_model_snapshot.h"
class ChromeBrowserState; class ChromeBrowserState;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment