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

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

Issue 2613223002: Remove ScopedVector from base::JSONValueConverter (Closed)
Patch Set: Rebase and address comments from mmenke@ Created 3 years, 11 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 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_INITIALIZER_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_INITIALIZER_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_INITIALIZER_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_INITIALIZER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_vector.h"
16 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
17 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h" 16 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h"
18 #include "chrome/browser/sync_file_system/sync_callbacks.h" 17 #include "chrome/browser/sync_file_system/sync_callbacks.h"
19 #include "google_apis/drive/drive_api_error_codes.h" 18 #include "google_apis/drive/drive_api_error_codes.h"
20 #include "google_apis/drive/drive_common_callbacks.h" 19 #include "google_apis/drive/drive_common_callbacks.h"
21 20
22 namespace google_apis { 21 namespace google_apis {
23 class AboutResource; 22 class AboutResource;
24 class FileList; 23 class FileList;
25 class FileResource; 24 class FileResource;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 98
100 SyncEngineContext* sync_context_; // Not owned. 99 SyncEngineContext* sync_context_; // Not owned.
101 leveldb::Env* env_override_; 100 leveldb::Env* env_override_;
102 101
103 google_apis::CancelCallback cancel_callback_; 102 google_apis::CancelCallback cancel_callback_;
104 base::FilePath database_path_; 103 base::FilePath database_path_;
105 104
106 int find_sync_root_retry_count_; 105 int find_sync_root_retry_count_;
107 106
108 std::unique_ptr<MetadataDatabase> metadata_database_; 107 std::unique_ptr<MetadataDatabase> metadata_database_;
109 ScopedVector<google_apis::FileResource> app_root_folders_; 108 std::vector<std::unique_ptr<google_apis::FileResource>> app_root_folders_;
110 109
111 int64_t largest_change_id_; 110 int64_t largest_change_id_;
112 std::string root_folder_id_; 111 std::string root_folder_id_;
113 112
114 std::unique_ptr<google_apis::FileResource> sync_root_folder_; 113 std::unique_ptr<google_apis::FileResource> sync_root_folder_;
115 114
116 base::WeakPtrFactory<SyncEngineInitializer> weak_ptr_factory_; 115 base::WeakPtrFactory<SyncEngineInitializer> weak_ptr_factory_;
117 116
118 DISALLOW_COPY_AND_ASSIGN(SyncEngineInitializer); 117 DISALLOW_COPY_AND_ASSIGN(SyncEngineInitializer);
119 }; 118 };
120 119
121 } // namespace drive_backend 120 } // namespace drive_backend
122 } // namespace sync_file_system 121 } // namespace sync_file_system
123 122
124 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_INITIALIZER _H_ 123 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_INITIALIZER _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698