summaryrefslogtreecommitdiffstats
path: root/base/nix
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 20:45:22 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 20:45:22 +0000
commit91d91fac1db8f2f163e4873bd93a65f4fada37ee (patch)
treea128f7ef2b816771bc0a69fa025350992c4ba5b9 /base/nix
parent666f40f61545af4f8f52d964c341d01630a352cd (diff)
downloadchromium_src-91d91fac1db8f2f163e4873bd93a65f4fada37ee.zip
chromium_src-91d91fac1db8f2f163e4873bd93a65f4fada37ee.tar.gz
chromium_src-91d91fac1db8f2f163e4873bd93a65f4fada37ee.tar.bz2
linux: components support for base/
This builds base_unittests using libbase as a component. Review URL: http://codereview.chromium.org/6904109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/nix')
-rw-r--r--base/nix/xdg_util.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/base/nix/xdg_util.h b/base/nix/xdg_util.h
index 5e711d5..8420a9e 100644
--- a/base/nix/xdg_util.h
+++ b/base/nix/xdg_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
@@ -13,6 +13,8 @@
// net. We should have a net API to allow the embedder to specify the behavior
// that it uses XDG for, and then move this file.
+#include "base/base_api.h"
+
#ifdef nix
#error asdf
#endif
@@ -30,14 +32,14 @@ namespace nix {
// a directory path. |fallback_dir| is the directory relative to $HOME that we
// use if |env_name| cannot be found or is empty. |fallback_dir| may be NULL.
// Examples of |env_name| are XDG_CONFIG_HOME and XDG_DATA_HOME.
-FilePath GetXDGDirectory(Environment* env, const char* env_name,
- const char* fallback_dir);
+BASE_API FilePath GetXDGDirectory(Environment* env, const char* env_name,
+ const char* fallback_dir);
// Wrapper around xdg_user_dir_lookup() from src/base/third_party/xdg-user-dirs
// This looks up "well known" user directories like the desktop and music
// folder. Examples of |dir_name| are DESKTOP and MUSIC.
-FilePath GetXDGUserDirectory(Environment* env, const char* dir_name,
- const char* fallback_dir);
+BASE_API FilePath GetXDGUserDirectory(Environment* env, const char* dir_name,
+ const char* fallback_dir);
enum DesktopEnvironment {
DESKTOP_ENVIRONMENT_OTHER,
@@ -53,13 +55,13 @@ enum DesktopEnvironment {
// of which desktop environment we're using. We use this to know when
// to attempt to use preferences from the desktop environment --
// proxy settings, password manager, etc.
-DesktopEnvironment GetDesktopEnvironment(Environment* env);
+BASE_API DesktopEnvironment GetDesktopEnvironment(Environment* env);
// Return a string representation of the given desktop environment.
// May return NULL in the case of DESKTOP_ENVIRONMENT_OTHER.
-const char* GetDesktopEnvironmentName(DesktopEnvironment env);
+BASE_API const char* GetDesktopEnvironmentName(DesktopEnvironment env);
// Convenience wrapper that calls GetDesktopEnvironment() first.
-const char* GetDesktopEnvironmentName(Environment* env);
+BASE_API const char* GetDesktopEnvironmentName(Environment* env);
} // namespace nix
} // namespace base