| 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 "chrome/browser/chromeos/drive/file_system_util.h" | 5 #include "chrome/browser/chromeos/drive/file_system_util.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "chrome/browser/chromeos/drive/write_on_cache_file.h" | 29 #include "chrome/browser/chromeos/drive/write_on_cache_file.h" |
| 30 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 30 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 31 #include "chrome/browser/chromeos/profiles/profile_util.h" | 31 #include "chrome/browser/chromeos/profiles/profile_util.h" |
| 32 #include "chrome/browser/profiles/profile.h" | 32 #include "chrome/browser/profiles/profile.h" |
| 33 #include "chrome/browser/profiles/profile_manager.h" | 33 #include "chrome/browser/profiles/profile_manager.h" |
| 34 #include "chrome/common/chrome_constants.h" | 34 #include "chrome/common/chrome_constants.h" |
| 35 #include "chrome/common/chrome_paths_internal.h" | 35 #include "chrome/common/chrome_paths_internal.h" |
| 36 #include "chrome/common/pref_names.h" | 36 #include "chrome/common/pref_names.h" |
| 37 #include "chrome/common/url_constants.h" | 37 #include "chrome/common/url_constants.h" |
| 38 #include "chromeos/chromeos_constants.h" | 38 #include "chromeos/chromeos_constants.h" |
| 39 #include "components/user_manager/user_manager.h" |
| 39 #include "content/public/browser/browser_thread.h" | 40 #include "content/public/browser/browser_thread.h" |
| 40 #include "net/base/escape.h" | 41 #include "net/base/escape.h" |
| 41 #include "webkit/browser/fileapi/file_system_url.h" | 42 #include "webkit/browser/fileapi/file_system_url.h" |
| 42 | 43 |
| 43 using content::BrowserThread; | 44 using content::BrowserThread; |
| 44 | 45 |
| 45 namespace drive { | 46 namespace drive { |
| 46 namespace util { | 47 namespace util { |
| 47 | 48 |
| 48 namespace { | 49 namespace { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 } | 115 } |
| 115 | 116 |
| 116 base::FilePath GetDriveMountPointPath(Profile* profile) { | 117 base::FilePath GetDriveMountPointPath(Profile* profile) { |
| 117 std::string id = chromeos::ProfileHelper::GetUserIdHashFromProfile(profile); | 118 std::string id = chromeos::ProfileHelper::GetUserIdHashFromProfile(profile); |
| 118 if (id.empty() || id == chrome::kLegacyProfileDir) { | 119 if (id.empty() || id == chrome::kLegacyProfileDir) { |
| 119 // ProfileHelper::GetUserIdHashFromProfile works only when multi-profile is | 120 // ProfileHelper::GetUserIdHashFromProfile works only when multi-profile is |
| 120 // enabled. In that case, we fall back to use UserManager (it basically just | 121 // enabled. In that case, we fall back to use UserManager (it basically just |
| 121 // returns currently active users's hash in such a case.) I still try | 122 // returns currently active users's hash in such a case.) I still try |
| 122 // ProfileHelper first because it works better in tests. | 123 // ProfileHelper first because it works better in tests. |
| 123 user_manager::User* const user = | 124 user_manager::User* const user = |
| 124 chromeos::UserManager::IsInitialized() | 125 user_manager::UserManager::IsInitialized() |
| 125 ? chromeos::ProfileHelper::Get()->GetUserByProfile( | 126 ? chromeos::ProfileHelper::Get()->GetUserByProfile( |
| 126 profile->GetOriginalProfile()) | 127 profile->GetOriginalProfile()) |
| 127 : NULL; | 128 : NULL; |
| 128 if (user) | 129 if (user) |
| 129 id = user->username_hash(); | 130 id = user->username_hash(); |
| 130 } | 131 } |
| 131 return GetDriveMountPointPathForUserIdHash(id); | 132 return GetDriveMountPointPathForUserIdHash(id); |
| 132 } | 133 } |
| 133 | 134 |
| 134 FileSystemInterface* GetFileSystemByProfile(Profile* profile) { | 135 FileSystemInterface* GetFileSystemByProfile(Profile* profile) { |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 const bool disable_sync_over_celluar = | 383 const bool disable_sync_over_celluar = |
| 383 profile->GetPrefs()->GetBoolean(prefs::kDisableDriveOverCellular); | 384 profile->GetPrefs()->GetBoolean(prefs::kDisableDriveOverCellular); |
| 384 | 385 |
| 385 if (is_connection_cellular && disable_sync_over_celluar) | 386 if (is_connection_cellular && disable_sync_over_celluar) |
| 386 return DRIVE_CONNECTED_METERED; | 387 return DRIVE_CONNECTED_METERED; |
| 387 return DRIVE_CONNECTED; | 388 return DRIVE_CONNECTED; |
| 388 } | 389 } |
| 389 | 390 |
| 390 } // namespace util | 391 } // namespace util |
| 391 } // namespace drive | 392 } // namespace drive |
| OLD | NEW |