| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/icon_manager.h" | 5 #include "chrome/browser/icon_manager.h" |
| 6 | 6 |
| 7 #include "base/mime_util.h" | 7 #include "base/mime_util.h" |
| 8 #include "base/threading/thread_restrictions.h" | 8 #include "base/threading/thread_restrictions.h" |
| 9 | 9 |
| 10 IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) { | 10 IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) { |
| 11 #if defined(USE_AURA) | |
| 12 // TODO(davemoore) Implement this for aura. | |
| 13 return std::string(); | |
| 14 #else | |
| 15 // It turns out the call to mime_util::GetFileMimeType below does IO, but | 11 // It turns out the call to mime_util::GetFileMimeType below does IO, but |
| 16 // callers of GetGroupIDFromFilepath assume it does not do IO (the Windows | 12 // callers of GetGroupIDFromFilepath assume it does not do IO (the Windows |
| 17 // and Mac implementations do not). We should fix this by either not doing IO | 13 // and Mac implementations do not). We should fix this by either not doing IO |
| 18 // in this method, or reworking callers to avoid calling it on the UI thread. | 14 // in this method, or reworking callers to avoid calling it on the UI thread. |
| 19 // See crbug.com/72740. | 15 // See crbug.com/72740. |
| 20 base::ThreadRestrictions::ScopedAllowIO allow_io; | 16 base::ThreadRestrictions::ScopedAllowIO allow_io; |
| 21 | 17 |
| 22 return mime_util::GetFileMimeType(filepath); | 18 return mime_util::GetFileMimeType(filepath); |
| 23 #endif | |
| 24 } | 19 } |
| OLD | NEW |