summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 21:05:56 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 21:05:56 +0000
commitc5d463ec9cf8eda310e0992b7bb30e9041dfa2b0 (patch)
treebd6bf910534a45c772585754061ae531e6ed81ae
parentafbdd164e2cc5babc0fc8b8574c5b95d4a818b78 (diff)
downloadchromium_src-c5d463ec9cf8eda310e0992b7bb30e9041dfa2b0.zip
chromium_src-c5d463ec9cf8eda310e0992b7bb30e9041dfa2b0.tar.gz
chromium_src-c5d463ec9cf8eda310e0992b7bb30e9041dfa2b0.tar.bz2
content: Add CONTENT_EXPORT in most places required to link tests on mac.
BUG=90078 TEST=none Review URL: http://codereview.chromium.org/9703071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126992 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/mach_broker_mac.h4
-rw-r--r--content/browser/renderer_host/render_widget_host_view_mac.h2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h4
-rw-r--r--content/browser/renderer_host/text_input_client_mac.h5
-rw-r--r--content/browser/renderer_host/text_input_client_message_filter.h5
-rw-r--r--content/common/mac/attributed_string_coder.h3
-rw-r--r--content/common/mac/font_descriptor.h5
-rw-r--r--content/common/mac/font_loader.h5
-rw-r--r--content/common/sandbox_mac.h5
-rw-r--r--content/renderer/render_view_impl.h7
10 files changed, 27 insertions, 18 deletions
diff --git a/content/browser/mach_broker_mac.h b/content/browser/mach_broker_mac.h
index 5c8e5f8..bc97f05 100644
--- a/content/browser/mach_broker_mac.h
+++ b/content/browser/mach_broker_mac.h
@@ -32,11 +32,11 @@
//
// Since this data arrives over a separate channel, it is not available
// immediately after a child process has been started.
-class MachBroker : public base::ProcessMetrics::PortProvider,
+class CONTENT_EXPORT MachBroker : public base::ProcessMetrics::PortProvider,
public content::NotificationObserver {
public:
// Returns the global MachBroker.
- CONTENT_EXPORT static MachBroker* GetInstance();
+ static MachBroker* GetInstance();
// Performs any necessary setup that cannot happen in the constructor.
// Callers MUST acquire the lock given by GetLock() before calling this
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index c8f5fd56..db85bfc 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -248,7 +248,7 @@ class RenderWidgetHostViewMac : public content::RenderWidgetHostViewBase {
gfx::PluginWindowHandle window) OVERRIDE;
// Exposed for testing.
- AcceleratedPluginView* ViewForPluginWindowHandle(
+ CONTENT_EXPORT AcceleratedPluginView* ViewForPluginWindowHandle(
gfx::PluginWindowHandle window);
// Helper to do the actual cleanup after a plugin handle has been destroyed.
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h
index bdafbaf..1c97837 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -27,7 +27,7 @@
// (note that this is not a misspelling of RenderWidgetHostViewMac, it's in
// fact a distinct object) When these selectors are called, the relevant
// edit command is executed in WebCore.
-class RenderWidgetHostViewMacEditCommandHelper {
+class CONTENT_EXPORT RenderWidgetHostViewMacEditCommandHelper {
FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewMacEditCommandHelperTest,
TestAddEditingSelectorsToClass);
FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewMacEditCommandHelperTest,
diff --git a/content/browser/renderer_host/text_input_client_mac.h b/content/browser/renderer_host/text_input_client_mac.h
index cf767995..cb7c15b 100644
--- a/content/browser/renderer_host/text_input_client_mac.h
+++ b/content/browser/renderer_host/text_input_client_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -10,6 +10,7 @@
#include "base/memory/scoped_nsobject.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
+#include "content/common/content_export.h"
#include "ui/gfx/point.h"
template <typename T> struct DefaultSingletonTraits;
@@ -32,7 +33,7 @@ class RenderWidgetHost;
// requires getting information from the renderer synchronously. Rather than
// using an actual sync IPC message, a normal async ViewMsg is used with a lock
// and condition (managed by this service).
-class TextInputClientMac {
+class CONTENT_EXPORT TextInputClientMac {
public:
// Returns the singleton instance.
static TextInputClientMac* GetInstance();
diff --git a/content/browser/renderer_host/text_input_client_message_filter.h b/content/browser/renderer_host/text_input_client_message_filter.h
index 3b80633..5a806b1 100644
--- a/content/browser/renderer_host/text_input_client_message_filter.h
+++ b/content/browser/renderer_host/text_input_client_message_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -20,7 +20,8 @@ class Range;
// This is a browser-side message filter that lives on the IO thread to handle
// replies to messages sent by the TextInputClientMac. See
// content/browser/renderer_host/text_input_client_mac.h for more information.
-class TextInputClientMessageFilter : public content::BrowserMessageFilter {
+class CONTENT_EXPORT TextInputClientMessageFilter
+ : public content::BrowserMessageFilter {
public:
explicit TextInputClientMessageFilter(int child_id);
virtual ~TextInputClientMessageFilter();
diff --git a/content/common/mac/attributed_string_coder.h b/content/common/mac/attributed_string_coder.h
index 0da8a9b..40eab17c 100644
--- a/content/common/mac/attributed_string_coder.h
+++ b/content/common/mac/attributed_string_coder.h
@@ -10,6 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
+#include "content/common/content_export.h"
#include "content/common/mac/font_descriptor.h"
#include "ipc/ipc_message_utils.h"
#include "ui/base/range/range.h"
@@ -30,7 +31,7 @@ namespace mac {
// friends to send objects from the renderer to the browser could lead to
// deserialization of arbitrary objects. This class restricts serialization to
// a specific object class and specific attributes of that object.
-class AttributedStringCoder {
+class CONTENT_EXPORT AttributedStringCoder {
public:
// A C++ IPC-friendly representation of the NSFontAttributeName attribute
// set.
diff --git a/content/common/mac/font_descriptor.h b/content/common/mac/font_descriptor.h
index 750976f..c9588aa 100644
--- a/content/common/mac/font_descriptor.h
+++ b/content/common/mac/font_descriptor.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -7,6 +7,7 @@
#pragma once
#include "base/string16.h"
+#include "content/common/content_export.h"
#ifdef __OBJC__
@class NSFont;
@@ -15,7 +16,7 @@ class NSFont;
#endif
// Container to allow serializing an NSFont over IPC.
-struct FontDescriptor {
+struct CONTENT_EXPORT FontDescriptor {
explicit FontDescriptor(NSFont* font);
FontDescriptor(string16 name, float size);
diff --git a/content/common/mac/font_loader.h b/content/common/mac/font_loader.h
index 17f63e1..0b64417 100644
--- a/content/common/mac/font_loader.h
+++ b/content/common/mac/font_loader.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -9,6 +9,7 @@
#include <ApplicationServices/ApplicationServices.h>
#include "base/shared_memory.h"
+#include "content/common/content_export.h"
#ifdef __OBJC__
@class NSFont;
@@ -33,6 +34,7 @@ class FontLoader {
// file.
// |font_data_size| - size of data contained in |font_data|.
// |font_id| - unique identifier for the on-disk file we load for the font.
+ CONTENT_EXPORT
static bool LoadFontIntoBuffer(NSFont* font_to_encode,
base::SharedMemory* font_data,
uint32* font_data_size,
@@ -49,6 +51,7 @@ class FontLoader {
// |out| - A CGFontRef corresponding to the designated font.
// The caller is responsible for releasing this value via CGFontRelease()
// when done.
+ CONTENT_EXPORT
static bool CGFontRefFromBuffer(base::SharedMemoryHandle font_data,
uint32 font_data_size,
CGFontRef* out);
diff --git a/content/common/sandbox_mac.h b/content/common/sandbox_mac.h
index 5fc96d9..399790f 100644
--- a/content/common/sandbox_mac.h
+++ b/content/common/sandbox_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -11,6 +11,7 @@
#include "base/basictypes.h"
#include "base/hash_tables.h"
#include "base/gtest_prod_util.h"
+#include "content/common/content_export.h"
#include "content/public/common/sandbox_type_mac.h"
class FilePath;
@@ -52,7 +53,7 @@ class SandboxSubstring {
SandboxSubstringType type_;
};
-class Sandbox {
+class CONTENT_EXPORT Sandbox {
public:
// A map of variable name -> string to substitute in its place.
typedef base::hash_map<std::string, SandboxSubstring>
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 50997d3..1b89c474 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -870,7 +870,8 @@ class RenderViewImpl : public RenderWidget,
void OnSetNavigationStartTime(
const base::TimeTicks& browser_navigation_start);
void OnSetWebUIProperty(const std::string& name, const std::string& value);
- void OnSetEditCommandsForNextKeyEvent(const EditCommands& edit_commands);
+ CONTENT_EXPORT void OnSetEditCommandsForNextKeyEvent(
+ const EditCommands& edit_commands);
CONTENT_EXPORT void OnSetHistoryLengthAndPrune(int history_length,
int32 minimum_page_id);
void OnSetInitialFocus(bool reverse);
@@ -893,12 +894,12 @@ class RenderViewImpl : public RenderWidget,
void OnThemeChanged();
void OnUndo();
void OnUpdateTargetURLAck();
- void OnUpdateWebPreferences(const WebPreferences& prefs);
+ CONTENT_EXPORT void OnUpdateWebPreferences(const WebPreferences& prefs);
#if defined(OS_MACOSX)
void OnWindowFrameChanged(const gfx::Rect& window_frame,
const gfx::Rect& view_frame);
- void OnSelectPopupMenuItem(int selected_index);
+ CONTENT_EXPORT void OnSelectPopupMenuItem(int selected_index);
#endif
void OnZoom(content::PageZoom zoom);
void OnZoomFactor(content::PageZoom zoom, int zoom_center_x,