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

Side by Side Diff: chromeos/disks/disk_mount_manager.cc

Issue 11414152: Drive: Rename GData to Drive in extension JS API (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: review fix (comment #7) Created 8 years 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
« no previous file with comments | « chromeos/dbus/cros_disks_client.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chromeos/disks/disk_mount_manager.h" 5 #include "chromeos/disks/disk_mount_manager.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 652
653 // static 653 // static
654 std::string DiskMountManager::MountTypeToString(MountType type) { 654 std::string DiskMountManager::MountTypeToString(MountType type) {
655 switch (type) { 655 switch (type) {
656 case MOUNT_TYPE_DEVICE: 656 case MOUNT_TYPE_DEVICE:
657 return "device"; 657 return "device";
658 case MOUNT_TYPE_ARCHIVE: 658 case MOUNT_TYPE_ARCHIVE:
659 return "file"; 659 return "file";
660 case MOUNT_TYPE_NETWORK_STORAGE: 660 case MOUNT_TYPE_NETWORK_STORAGE:
661 return "network"; 661 return "network";
662 case MOUNT_TYPE_GDATA: 662 case MOUNT_TYPE_GOOGLE_DRIVE:
663 return "gdata"; 663 return "drive";
664 case MOUNT_TYPE_INVALID: 664 case MOUNT_TYPE_INVALID:
665 return "invalid"; 665 return "invalid";
666 default: 666 default:
667 NOTREACHED(); 667 NOTREACHED();
668 } 668 }
669 return ""; 669 return "";
670 } 670 }
671 671
672 // static 672 // static
673 std::string DiskMountManager::MountConditionToString(MountCondition condition) { 673 std::string DiskMountManager::MountConditionToString(MountCondition condition) {
(...skipping 11 matching lines...) Expand all
685 } 685 }
686 686
687 // static 687 // static
688 MountType DiskMountManager::MountTypeFromString(const std::string& type_str) { 688 MountType DiskMountManager::MountTypeFromString(const std::string& type_str) {
689 if (type_str == "device") 689 if (type_str == "device")
690 return MOUNT_TYPE_DEVICE; 690 return MOUNT_TYPE_DEVICE;
691 else if (type_str == "network") 691 else if (type_str == "network")
692 return MOUNT_TYPE_NETWORK_STORAGE; 692 return MOUNT_TYPE_NETWORK_STORAGE;
693 else if (type_str == "file") 693 else if (type_str == "file")
694 return MOUNT_TYPE_ARCHIVE; 694 return MOUNT_TYPE_ARCHIVE;
695 else if (type_str == "gdata") 695 else if (type_str == "drive")
696 return MOUNT_TYPE_GDATA; 696 return MOUNT_TYPE_GOOGLE_DRIVE;
697 else 697 else
698 return MOUNT_TYPE_INVALID; 698 return MOUNT_TYPE_INVALID;
699 } 699 }
700 700
701 // static 701 // static
702 std::string DiskMountManager::DeviceTypeToString(DeviceType type) { 702 std::string DiskMountManager::DeviceTypeToString(DeviceType type) {
703 switch (type) { 703 switch (type) {
704 case DEVICE_TYPE_USB: 704 case DEVICE_TYPE_USB:
705 return "usb"; 705 return "usb";
706 case DEVICE_TYPE_SD: 706 case DEVICE_TYPE_SD:
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 VLOG(1) << "DiskMountManager Shutdown completed"; 746 VLOG(1) << "DiskMountManager Shutdown completed";
747 } 747 }
748 748
749 // static 749 // static
750 DiskMountManager* DiskMountManager::GetInstance() { 750 DiskMountManager* DiskMountManager::GetInstance() {
751 return g_disk_mount_manager; 751 return g_disk_mount_manager;
752 } 752 }
753 753
754 } // namespace disks 754 } // namespace disks
755 } // namespace chromeos 755 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/cros_disks_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698