Commit 1ac7bbfd authored by dpranke@chromium.org's avatar dpranke@chromium.org

Update content_api to match naming conventions, style in ui_api.h, make work...

Update content_api to match naming conventions, style in ui_api.h, make work for linux build as well.

R=jam@chromium.org
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7482022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97036 0039d316-1c4b-4281-b951-d872f2087c98
parent 0153ee6f
...@@ -2,24 +2,25 @@ ...@@ -2,24 +2,25 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_COMMON_CONTENT_API_H_ #ifndef CONTENT_COMMON_CONTENT_EXPORT_H_
#define CONTENT_COMMON_CONTENT_API_H_ #define CONTENT_COMMON_CONTENT_EXPORT_H_
#pragma once #pragma once
// Defines CONTENT_API so that funtionality implemented by the content module #if defined(COMPONENT_BUILD)
// can be exported to consumers, and CONTENT_TEST that allows unit tests to #if defined(WIN32)
// access features not intended to be used directly by real consumers.
#if defined(WIN32) && defined(CONTENT_DLL)
#if defined(CONTENT_IMPLEMENTATION) #if defined(CONTENT_IMPLEMENTATION)
#define CONTENT_API __declspec(dllexport) #define CONTENT_EXPORT __declspec(dllexport)
#define CONTENT_TEST __declspec(dllexport)
#else #else
#define CONTENT_API __declspec(dllimport) #define CONTENT_EXPORT __declspec(dllimport)
#define CONTENT_TEST __declspec(dllimport)
#endif // defined(CONTENT_IMPLEMENTATION) #endif // defined(CONTENT_IMPLEMENTATION)
#else
#define CONTENT_API #else // defined(WIN32)
#define CONTENT_TEST #define CONTENT_EXPORT __attribute__((visibility("default"))
#endif
#else // defined(COMPONENT_BUILD)
#define CONTENT_EXPORT
#endif #endif
#endif // CONTENT_COMMON_CONTENT_API_H_ #endif // CONTENT_COMMON_CONTENT_EXPORT_H_
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
'common/common_param_traits.h', 'common/common_param_traits.h',
'common/content_message_generator.cc', 'common/content_message_generator.cc',
'common/content_message_generator.h', 'common/content_message_generator.h',
'common/content_api.h', 'common/content_export.h',
'common/content_client.cc', 'common/content_client.cc',
'common/content_client.h', 'common/content_client.h',
'common/content_constants.cc', 'common/content_constants.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment