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

Side by Side Diff: webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc

Issue 16010006: Move webkit/chromeos into webkit/browser/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
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 #include "webkit/chromeos/fileapi/cros_mount_point_provider.h" 5 #include "webkit/browser/chromeos/fileapi/cros_mount_point_provider.h"
6 6
7 #include "base/chromeos/chromeos_version.h" 7 #include "base/chromeos/chromeos_version.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
12 #include "base/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chromeos/dbus/cros_disks_client.h" 14 #include "chromeos/dbus/cros_disks_client.h"
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h"
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
18 #include "webkit/browser/chromeos/fileapi/file_access_permissions.h"
19 #include "webkit/browser/chromeos/fileapi/remote_file_stream_writer.h"
20 #include "webkit/browser/chromeos/fileapi/remote_file_system_operation.h"
18 #include "webkit/browser/fileapi/async_file_util_adapter.h" 21 #include "webkit/browser/fileapi/async_file_util_adapter.h"
19 #include "webkit/browser/fileapi/copy_or_move_file_validator.h" 22 #include "webkit/browser/fileapi/copy_or_move_file_validator.h"
20 #include "webkit/browser/fileapi/external_mount_points.h" 23 #include "webkit/browser/fileapi/external_mount_points.h"
21 #include "webkit/browser/fileapi/file_system_context.h" 24 #include "webkit/browser/fileapi/file_system_context.h"
22 #include "webkit/browser/fileapi/file_system_file_stream_reader.h" 25 #include "webkit/browser/fileapi/file_system_file_stream_reader.h"
23 #include "webkit/browser/fileapi/file_system_operation_context.h" 26 #include "webkit/browser/fileapi/file_system_operation_context.h"
24 #include "webkit/browser/fileapi/file_system_task_runners.h" 27 #include "webkit/browser/fileapi/file_system_task_runners.h"
25 #include "webkit/browser/fileapi/file_system_url.h" 28 #include "webkit/browser/fileapi/file_system_url.h"
26 #include "webkit/browser/fileapi/isolated_context.h" 29 #include "webkit/browser/fileapi/isolated_context.h"
27 #include "webkit/browser/fileapi/isolated_file_util.h" 30 #include "webkit/browser/fileapi/isolated_file_util.h"
28 #include "webkit/browser/fileapi/local_file_stream_writer.h" 31 #include "webkit/browser/fileapi/local_file_stream_writer.h"
29 #include "webkit/browser/fileapi/local_file_system_operation.h" 32 #include "webkit/browser/fileapi/local_file_system_operation.h"
30 #include "webkit/chromeos/fileapi/file_access_permissions.h"
31 #include "webkit/chromeos/fileapi/remote_file_stream_writer.h"
32 #include "webkit/chromeos/fileapi/remote_file_system_operation.h"
33 #include "webkit/glue/webkit_glue.h" 33 #include "webkit/glue/webkit_glue.h"
34 34
35 namespace { 35 namespace {
36 36
37 const char kChromeUIScheme[] = "chrome"; 37 const char kChromeUIScheme[] = "chrome";
38 38
39 } // namespace 39 } // namespace
40 40
41 namespace chromeos { 41 namespace chromeos {
42 42
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 fileapi::RemoteFileSystemProxyInterface* CrosMountPointProvider::GetRemoteProxy( 349 fileapi::RemoteFileSystemProxyInterface* CrosMountPointProvider::GetRemoteProxy(
350 const std::string& mount_name) const { 350 const std::string& mount_name) const {
351 fileapi::RemoteFileSystemProxyInterface* proxy = 351 fileapi::RemoteFileSystemProxyInterface* proxy =
352 mount_points_->GetRemoteFileSystemProxy(mount_name); 352 mount_points_->GetRemoteFileSystemProxy(mount_name);
353 if (proxy) 353 if (proxy)
354 return proxy; 354 return proxy;
355 return system_mount_points_->GetRemoteFileSystemProxy(mount_name); 355 return system_mount_points_->GetRemoteFileSystemProxy(mount_name);
356 } 356 }
357 357
358 } // namespace chromeos 358 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698