| Index: net/base/platform_mime_util_linux.cc
|
| diff --git a/net/base/platform_mime_util_linux.cc b/net/base/platform_mime_util_linux.cc
|
| index 19b315c7c3ec09f58ca0b0eb4899b7b4ebfbe0d1..c841914dde778d9ac6850620f3e910382ac1d7f7 100644
|
| --- a/net/base/platform_mime_util_linux.cc
|
| +++ b/net/base/platform_mime_util_linux.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2006-2008 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.
|
|
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <string>
|
|
|
| +#include "base/logging.h"
|
| #include "build/build_config.h"
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -17,14 +18,17 @@
|
| namespace net {
|
|
|
| #if defined(OS_ANDROID)
|
| -
|
| bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
|
| const FilePath::StringType& ext, std::string* result) const {
|
| return android::GetMimeTypeFromExtension(ext, result);
|
| }
|
| -
|
| +#elif defined(USE_AURA)
|
| +bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
|
| + const FilePath::StringType& ext, std::string* result) const {
|
| + NOTIMPLEMENTED();
|
| + return false;
|
| +}
|
| #else
|
| -
|
| bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
|
| const FilePath::StringType& ext, std::string* result) const {
|
| // TODO(thestig) This is a temporary hack until we can fix this
|
|
|