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

Side by Side Diff: chrome/browser/icon_manager_linux.cc

Issue 8501030: aura: Make the Linux version of IconLoader not require GTK+. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move platform-specific include Created 9 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/icon_loader_linux.cc ('k') | chrome/chrome_browser.gypi » ('j') | 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) 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 }
OLDNEW
« no previous file with comments | « chrome/browser/icon_loader_linux.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698