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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_engine.h

Issue 26775010: fix build after clang roll (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/sync_engine.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 // The owner of the SyncEngine is responsible for their lifetime. 133 // The owner of the SyncEngine is responsible for their lifetime.
134 // I.e. the owner should declare the dependency explicitly by calling 134 // I.e. the owner should declare the dependency explicitly by calling
135 // BrowserContextKeyedService::DependsOn(). 135 // BrowserContextKeyedService::DependsOn().
136 drive::DriveNotificationManager* notification_manager_; 136 drive::DriveNotificationManager* notification_manager_;
137 ExtensionService* extension_service_; 137 ExtensionService* extension_service_;
138 138
139 ObserverList<SyncServiceObserver> service_observers_; 139 ObserverList<SyncServiceObserver> service_observers_;
140 ObserverList<FileStatusObserver> file_status_observers_; 140 ObserverList<FileStatusObserver> file_status_observers_;
141 RemoteChangeProcessor* remote_change_processor_; 141 RemoteChangeProcessor* remote_change_processor_;
142 142
143 // TODO: This should be the last member in this class.
144 base::WeakPtrFactory<SyncEngine> weak_ptr_factory_;
143 SyncTaskManager task_manager_; 145 SyncTaskManager task_manager_;
144 base::WeakPtrFactory<SyncEngine> weak_ptr_factory_;
145 146
146 DISALLOW_COPY_AND_ASSIGN(SyncEngine); 147 DISALLOW_COPY_AND_ASSIGN(SyncEngine);
147 }; 148 };
148 149
149 } // namespace drive_backend 150 } // namespace drive_backend
150 } // namespace sync_file_system 151 } // namespace sync_file_system
151 152
152 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_ 153 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/sync_engine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698