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

Side by Side Diff: chrome/browser/chromeos/file_manager/volume_manager.cc

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up DEPS per feedback Created 6 years, 3 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 #include "chrome/browser/chromeos/file_manager/volume_manager.h" 5 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h" 21 #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
22 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info .h" 22 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info .h"
23 #include "chrome/browser/chromeos/profiles/profile_helper.h" 23 #include "chrome/browser/chromeos/profiles/profile_helper.h"
24 #include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h" 24 #include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h"
25 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/common/pref_names.h" 26 #include "chrome/common/pref_names.h"
27 #include "chromeos/disks/disk_mount_manager.h" 27 #include "chromeos/disks/disk_mount_manager.h"
28 #include "components/storage_monitor/storage_monitor.h" 28 #include "components/storage_monitor/storage_monitor.h"
29 #include "content/public/browser/browser_context.h" 29 #include "content/public/browser/browser_context.h"
30 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
31 #include "webkit/browser/fileapi/external_mount_points.h" 31 #include "storage/browser/fileapi/external_mount_points.h"
32 32
33 namespace file_manager { 33 namespace file_manager {
34 namespace { 34 namespace {
35 35
36 const char kFileManagerMTPMountNamePrefix[] = "fileman-mtp-"; 36 const char kFileManagerMTPMountNamePrefix[] = "fileman-mtp-";
37 const char kMtpVolumeIdPrefix [] = "mtp:"; 37 const char kMtpVolumeIdPrefix [] = "mtp:";
38 38
39 // Registers |path| as the "Downloads" folder to the FileSystem API backend. 39 // Registers |path| as the "Downloads" folder to the FileSystem API backend.
40 // If another folder is already mounted. It revokes and overrides the old one. 40 // If another folder is already mounted. It revokes and overrides the old one.
41 bool RegisterDownloadsMountPoint(Profile* profile, const base::FilePath& path) { 41 bool RegisterDownloadsMountPoint(Profile* profile, const base::FilePath& path) {
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 return; 791 return;
792 if (error_code == chromeos::MOUNT_ERROR_NONE) 792 if (error_code == chromeos::MOUNT_ERROR_NONE)
793 mounted_volumes_.erase(volume_info.volume_id); 793 mounted_volumes_.erase(volume_info.volume_id);
794 794
795 FOR_EACH_OBSERVER(VolumeManagerObserver, 795 FOR_EACH_OBSERVER(VolumeManagerObserver,
796 observers_, 796 observers_,
797 OnVolumeUnmounted(error_code, volume_info)); 797 OnVolumeUnmounted(error_code, volume_info));
798 } 798 }
799 799
800 } // namespace file_manager 800 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698