diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 02:00:53 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 02:00:53 +0000 |
| commit | ba9d60b681bef673558fc0d824ba86514e1fa841 (patch) | |
| tree | bb6a981c9152b2d45851ae0a2eebcb2b6f4dfff8 /chrome/browser/icon_manager_linux.cc | |
| parent | c19f27c31bf6295fba15bbc3ebe872762a3ee98a (diff) | |
| download | chromium_src-ba9d60b681bef673558fc0d824ba86514e1fa841.zip chromium_src-ba9d60b681bef673558fc0d824ba86514e1fa841.tar.gz chromium_src-ba9d60b681bef673558fc0d824ba86514e1fa841.tar.bz2 | |
Resolve five aura linking problems
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8166005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_manager_linux.cc')
| -rw-r--r-- | chrome/browser/icon_manager_linux.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/icon_manager_linux.cc b/chrome/browser/icon_manager_linux.cc index 53fd124..930320e 100644 --- a/chrome/browser/icon_manager_linux.cc +++ b/chrome/browser/icon_manager_linux.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,10 @@ #include "base/threading/thread_restrictions.h" IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) { +#if defined(USE_AURA) + // TODO(davemoore) Implement this for aura. + return std::string(); +#else // It turns out the call to mime_util::GetFileMimeType below does IO, but // callers of GetGroupIDFromFilepath assume it does not do IO (the Windows // and Mac implementations do not). We should fix this by either not doing IO @@ -16,4 +20,5 @@ IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) { base::ThreadRestrictions::ScopedAllowIO allow_io; return mime_util::GetFileMimeType(filepath); +#endif } |