diff options
author | maf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-30 00:12:35 +0000 |
---|---|---|
committer | maf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-30 00:12:35 +0000 |
commit | 606792fc6d2f4937db65dac6e0991fd538a00c60 (patch) | |
tree | 114dc48a74e0e98e946e253dd10e228afda01750 | |
parent | fcef9e0afacd9dbf4de19651e5da4d9d0ebcae27 (diff) | |
download | chromium_src-606792fc6d2f4937db65dac6e0991fd538a00c60.zip chromium_src-606792fc6d2f4937db65dac6e0991fd538a00c60.tar.gz chromium_src-606792fc6d2f4937db65dac6e0991fd538a00c60.tar.bz2 |
Revert 83631 - linux: successfully build net_unittests in components build
Just tagging more bits of base API.
Review URL: http://codereview.chromium.org/6902169
TBR=evan@chromium.org
Review URL: http://codereview.chromium.org/6902183
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83637 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | base/environment.h | 2 | ||||
-rw-r--r-- | base/mime_util.h | 12 | ||||
-rw-r--r-- | net/proxy/proxy_config_service_linux.h | 3 |
3 files changed, 7 insertions, 10 deletions
diff --git a/base/environment.h b/base/environment.h index 9d2a662..cf71724 100644 --- a/base/environment.h +++ b/base/environment.h @@ -16,7 +16,7 @@ namespace base { namespace env_vars { #if defined(OS_POSIX) -BASE_API extern const char kHome[]; +extern const char kHome[]; #endif } // namespace env_vars diff --git a/base/mime_util.h b/base/mime_util.h index 0348811..6212b31 100644 --- a/base/mime_util.h +++ b/base/mime_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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,8 +8,6 @@ #include <string> -#include "base/base_api.h" - class FilePath; namespace mime_util { @@ -18,23 +16,23 @@ namespace mime_util { // have to exist. Please note because it doesn't touch the disk, this does not // work for directories. // If the mime type is unknown, this will return application/octet-stream. -BASE_API std::string GetFileMimeType(const FilePath& filepath); +std::string GetFileMimeType(const FilePath& filepath); // Get the mime type for a byte vector. -BASE_API std::string GetDataMimeType(const std::string& data); +std::string GetDataMimeType(const std::string& data); #if defined(TOOLKIT_GTK) // This detects the current GTK theme by calling gtk_settings_get_default(). // It should only be executed on the UI thread and must be called before // GetMimeIcon(). -BASE_API void DetectGtkTheme(); +void DetectGtkTheme(); #endif // Gets the file name for an icon given the mime type and icon pixel size. // Where an icon is a square image of |size| x |size|. // This will try to find the closest matching icon. If that's not available, // then a generic icon, and finally an empty FilePath if all else fails. -BASE_API FilePath GetMimeIcon(const std::string& mime_type, size_t size); +FilePath GetMimeIcon(const std::string& mime_type, size_t size); } // namespace mime_util diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h index e59d3c8..2f1ad0c 100644 --- a/net/proxy/proxy_config_service_linux.h +++ b/net/proxy/proxy_config_service_linux.h @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "base/base_api.h" #include "base/basictypes.h" #include "base/environment.h" #include "base/memory/ref_counted.h" @@ -24,7 +23,7 @@ namespace net { // Implementation of ProxyConfigService that retrieves the system proxy // settings from environment variables or gconf. -class BASE_API ProxyConfigServiceLinux : public ProxyConfigService { +class ProxyConfigServiceLinux : public ProxyConfigService { public: // Forward declaration of Delegate. |