summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-03 21:09:40 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-03 21:09:40 +0000
commit12e72402fa74824690a54a81d643f3658e32b963 (patch)
tree1e1e448278196e4e04038721ab02ee41ae0f4bc2 /content/browser
parent3c852baf496021a0b9e03d24aa85dfa6fc1c4570 (diff)
downloadchromium_src-12e72402fa74824690a54a81d643f3658e32b963.zip
chromium_src-12e72402fa74824690a54a81d643f3658e32b963.tar.gz
chromium_src-12e72402fa74824690a54a81d643f3658e32b963.tar.bz2
mac: Make components build work in 64bit mode.
- CoreAnimation moved from Cocoa to QuartzCore - symbol visibility now applies to ObjC interfaces, so many of these need _EXPORT annotations - private ivars are now always hidden symbols, so categories in one module can't access private ivars of interfaces from another module (the only instance of this was ui_localizer.mm, the fix was to make the IBOutlet ivars of a class in GTM @protected instead). - to not require _EXPORT annotations in GTM (which is third-party code), build the GTM files without -fvisibility=hidden when doing a components build. BUG=190508 TBR=avi,tony Review URL: https://codereview.chromium.org/13507002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/web_contents/web_contents_view_mac.h2
-rw-r--r--content/browser/web_contents/web_drag_dest_mac.h3
-rw-r--r--content/browser/web_contents/web_drag_source_mac.h2
3 files changed, 6 insertions, 1 deletions
diff --git a/content/browser/web_contents/web_contents_view_mac.h b/content/browser/web_contents/web_contents_view_mac.h
index fdba569..53888b0 100644
--- a/content/browser/web_contents/web_contents_view_mac.h
+++ b/content/browser/web_contents/web_contents_view_mac.h
@@ -12,6 +12,7 @@
#include "base/memory/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
+#include "content/common/content_export.h"
#include "content/common/drag_event_source_info.h"
#include "content/port/browser/render_view_host_delegate_view.h"
#include "content/port/browser/web_contents_view_port.h"
@@ -33,6 +34,7 @@ namespace gfx {
class Vector2d;
}
+CONTENT_EXPORT
@interface WebContentsViewCocoa : BaseView {
@private
content::WebContentsViewMac* webContentsView_; // WEAK; owns us
diff --git a/content/browser/web_contents/web_drag_dest_mac.h b/content/browser/web_contents/web_drag_dest_mac.h
index 4358e2b..a344a4c 100644
--- a/content/browser/web_contents/web_drag_dest_mac.h
+++ b/content/browser/web_contents/web_drag_dest_mac.h
@@ -6,6 +6,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
+#include "content/common/content_export.h"
#include "webkit/glue/webdropdata.h"
@@ -21,7 +22,7 @@ typedef content::RenderViewHost* RenderViewHostIdentifier;
// A class that handles tracking and event processing for a drag and drop
// over the content area. Assumes something else initiates the drag, this is
// only for processing during a drag.
-
+CONTENT_EXPORT
@interface WebDragDest : NSObject {
@private
// Our associated WebContentsImpl. Weak reference.
diff --git a/content/browser/web_contents/web_drag_source_mac.h b/content/browser/web_contents/web_drag_source_mac.h
index a8f1f00..8e2f02c 100644
--- a/content/browser/web_contents/web_drag_source_mac.h
+++ b/content/browser/web_contents/web_drag_source_mac.h
@@ -8,6 +8,7 @@
#include "base/mac/scoped_cftyperef.h"
#include "base/memory/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
+#include "content/common/content_export.h"
#include "googleurl/src/gurl.h"
struct WebDropData;
@@ -17,6 +18,7 @@ class WebContentsImpl;
// A class that handles tracking and event processing for a drag and drop
// originating from the content area.
+CONTENT_EXPORT
@interface WebDragSource : NSObject {
@private
// Our contents. Weak reference (owns or co-owns us).