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

Side by Side Diff: trunk/src/webkit/fileapi/sandbox_mount_point_provider.h

Issue 15292007: Revert 200828 "Move webkit/fileapi/file_system_mount_point_provi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/fileapi/sandbox_mount_point_provider.h:r3734-4217,4606-5108,5177-5263
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_ 5 #ifndef WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
6 #define WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_ 6 #define WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "googleurl/src/gurl.h" 17 #include "googleurl/src/gurl.h"
18 #include "webkit/browser/fileapi/file_system_mount_point_provider.h" 18 #include "webkit/fileapi/file_system_mount_point_provider.h"
19 #include "webkit/fileapi/file_system_options.h" 19 #include "webkit/fileapi/file_system_options.h"
20 #include "webkit/fileapi/file_system_quota_util.h" 20 #include "webkit/fileapi/file_system_quota_util.h"
21 #include "webkit/fileapi/task_runner_bound_observer_list.h" 21 #include "webkit/fileapi/task_runner_bound_observer_list.h"
22 #include "webkit/quota/special_storage_policy.h" 22 #include "webkit/quota/special_storage_policy.h"
23 #include "webkit/storage/webkit_storage_export.h" 23 #include "webkit/storage/webkit_storage_export.h"
24 24
25 namespace base { 25 namespace base {
26 class SequencedTaskRunner; 26 class SequencedTaskRunner;
27 } 27 }
28 28
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_; 256 scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
257 257
258 base::WeakPtrFactory<SandboxMountPointProvider> weak_factory_; 258 base::WeakPtrFactory<SandboxMountPointProvider> weak_factory_;
259 259
260 DISALLOW_COPY_AND_ASSIGN(SandboxMountPointProvider); 260 DISALLOW_COPY_AND_ASSIGN(SandboxMountPointProvider);
261 }; 261 };
262 262
263 } // namespace fileapi 263 } // namespace fileapi
264 264
265 #endif // WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_ 265 #endif // WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698