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

Side by Side Diff: ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add header 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef IOS_CHROME_BROWSER_SYNC_SESSIONS_IOS_CHROME_LOCAL_EVENT_SESSION_ROUTER_H _ 5 #ifndef IOS_CHROME_BROWSER_SYNC_SESSIONS_IOS_CHROME_LOCAL_EVENT_SESSION_ROUTER_H _
6 #define IOS_CHROME_BROWSER_SYNC_SESSIONS_IOS_CHROME_LOCAL_EVENT_SESSION_ROUTER_H _ 6 #define IOS_CHROME_BROWSER_SYNC_SESSIONS_IOS_CHROME_LOCAL_EVENT_SESSION_ROUTER_H _
7 7
8 #include <stddef.h> 8 #include <stddef.h>
noyau (Ping after 24h) 2016/04/07 13:34:05 #include <memory>
9 9
10 #include <set> 10 #include <set>
11 11
12 #include "base/callback_list.h" 12 #include "base/callback_list.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "components/sync_sessions/local_session_event_router.h" 14 #include "components/sync_sessions/local_session_event_router.h"
15 #include "ios/web/public/web_state/global_web_state_observer.h" 15 #include "ios/web/public/web_state/global_web_state_observer.h"
16 #include "sync/api/syncable_service.h" 16 #include "sync/api/syncable_service.h"
17 17
18 class GURL; 18 class GURL;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 // http://www.google.com/favicon.ico) have changed. It is valid to call 65 // http://www.google.com/favicon.ico) have changed. It is valid to call
66 // OnFaviconsChanged() with non-empty |page_urls| and an empty |icon_url| 66 // OnFaviconsChanged() with non-empty |page_urls| and an empty |icon_url|
67 // and vice versa. 67 // and vice versa.
68 void OnFaviconsChanged(const std::set<GURL>& page_urls, const GURL& icon_url); 68 void OnFaviconsChanged(const std::set<GURL>& page_urls, const GURL& icon_url);
69 69
70 browser_sync::LocalSessionEventHandler* handler_; 70 browser_sync::LocalSessionEventHandler* handler_;
71 ios::ChromeBrowserState* const browser_state_; 71 ios::ChromeBrowserState* const browser_state_;
72 sync_sessions::SyncSessionsClient* const sessions_client_; 72 sync_sessions::SyncSessionsClient* const sessions_client_;
73 syncer::SyncableService::StartSyncFlare flare_; 73 syncer::SyncableService::StartSyncFlare flare_;
74 74
75 scoped_ptr<base::CallbackList<void(const std::set<GURL>&, 75 std::unique_ptr<base::CallbackList<void(const std::set<GURL>&,
76 const GURL&)>::Subscription> 76 const GURL&)>::Subscription>
77 favicon_changed_subscription_; 77 favicon_changed_subscription_;
78 78
79 scoped_ptr<base::CallbackList<void(web::WebState*)>::Subscription> 79 std::unique_ptr<base::CallbackList<void(web::WebState*)>::Subscription>
80 tab_parented_subscription_; 80 tab_parented_subscription_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(IOSChromeLocalSessionEventRouter); 82 DISALLOW_COPY_AND_ASSIGN(IOSChromeLocalSessionEventRouter);
83 }; 83 };
84 84
85 #endif // IOS_CHROME_BROWSER_SYNC_SESSIONS_IOS_CHROME_LOCAL_EVENT_SESSION_ROUTE R_H_ 85 #endif // IOS_CHROME_BROWSER_SYNC_SESSIONS_IOS_CHROME_LOCAL_EVENT_SESSION_ROUTE R_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698