summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-08 02:22:51 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-08 02:22:51 +0000
commit18d2378776e116a584dfa443b77e8ea14b34952f (patch)
tree4bf493f08e2b00794f427e115507d8c268ad8511 /ui
parent752179c0367f8483d4f5764eaab1d11ae44b8644 (diff)
downloadchromium_src-18d2378776e116a584dfa443b77e8ea14b34952f.zip
chromium_src-18d2378776e116a584dfa443b77e8ea14b34952f.tar.gz
chromium_src-18d2378776e116a584dfa443b77e8ea14b34952f.tar.bz2
aura: Fix component build for aura_builder (aura_unitests and aura_shell_exe).
BUG=none TEST=component build works for aura_builder TBR=sky@chromium.org Review URL: http://codereview.chromium.org/8207014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/aura/aura.gyp1
-rw-r--r--ui/aura_shell/shell.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 2be11e8..ba45038 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -81,6 +81,7 @@
'../../base/base.gyp:test_support_base',
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
+ '../gfx/compositor/compositor.gyp:compositor',
'../gfx/gl/gl.gyp:gl',
'../ui.gyp:gfx_resources',
'../ui.gyp:ui',
diff --git a/ui/aura_shell/shell.h b/ui/aura_shell/shell.h
index 2d1107c..c6983c3 100644
--- a/ui/aura_shell/shell.h
+++ b/ui/aura_shell/shell.h
@@ -13,6 +13,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ui/aura/desktop_delegate.h"
+#include "ui/aura_shell/aura_shell_export.h"
namespace aura {
class Window;
@@ -25,7 +26,7 @@ namespace aura_shell {
// Shell is a singleton object that presents the Shell API and implements the
// Desktop's delegate interface.
-class Shell : public aura::DesktopDelegate {
+class AURA_SHELL_EXPORT Shell : public aura::DesktopDelegate {
public:
// Upon creation, the Shell sets itself as the Desktop's delegate, which takes
// ownership of the Shell.