| OLD | NEW |
|---|
| 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> | |
| 8 #include <set> | 7 #include <set> |
| 9 | 8 |
| 10 #include "base/bind.h" | 9 #include "base/bind.h" |
| 11 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| 12 #include "base/observer_list.h" | 11 #include "base/observer_list.h" |
| 13 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
| 14 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 15 #include "chromeos/dbus/dbus_thread_manager.h" | 14 #include "chromeos/dbus/dbus_thread_manager.h" |
| 16 | 15 |
| 17 namespace chromeos { | 16 namespace chromeos { |
| (...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 VLOG(1) << "DiskMountManager Shutdown completed"; | 747 VLOG(1) << "DiskMountManager Shutdown completed"; |
| 749 } | 748 } |
| 750 | 749 |
| 751 // static | 750 // static |
| 752 DiskMountManager* DiskMountManager::GetInstance() { | 751 DiskMountManager* DiskMountManager::GetInstance() { |
| 753 return g_disk_mount_manager; | 752 return g_disk_mount_manager; |
| 754 } | 753 } |
| 755 | 754 |
| 756 } // namespace disks | 755 } // namespace disks |
| 757 } // namespace chromeos | 756 } // namespace chromeos |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 947173002:
Remove duplicate includes from chromeos/ (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master