diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 19:34:24 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 19:34:24 +0000 |
| commit | ffffa4d090c7397fa8937f5a05baabfa69701bb0 (patch) | |
| tree | 7664787e9379f0c953fa3d6160552bd8f814454c /ui/aura_shell | |
| parent | b4a39e7a4f2acf8727339b1fecfec4f9639afe40 (diff) | |
| download | chromium_src-ffffa4d090c7397fa8937f5a05baabfa69701bb0.zip chromium_src-ffffa4d090c7397fa8937f5a05baabfa69701bb0.tar.gz chromium_src-ffffa4d090c7397fa8937f5a05baabfa69701bb0.tar.bz2 | |
Aura: Fix linux component build
We appear to need to mark classes AURA_SHELL_EXPORT in order to use them in unit tests.
TBR=sky@chromium.org
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/8911010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/activation_controller.h | 8 | ||||
| -rw-r--r-- | ui/aura_shell/shelf_layout_manager.h | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ui/aura_shell/activation_controller.h b/ui/aura_shell/activation_controller.h index 226c26c..0a4e129 100644 --- a/ui/aura_shell/activation_controller.h +++ b/ui/aura_shell/activation_controller.h @@ -12,13 +12,15 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/root_window_observer.h" #include "ui/aura/window_observer.h" +#include "ui/aura_shell/aura_shell_export.h" namespace aura_shell { namespace internal { -class ActivationController : public aura::ActivationClient, - public aura::WindowObserver, - public aura::RootWindowObserver { +// Exported for unit tests. +class AURA_SHELL_EXPORT ActivationController : public aura::ActivationClient, + public aura::WindowObserver, + public aura::RootWindowObserver { public: ActivationController(); virtual ~ActivationController(); diff --git a/ui/aura_shell/shelf_layout_manager.h b/ui/aura_shell/shelf_layout_manager.h index e7ff8f9..152c0e7 100644 --- a/ui/aura_shell/shelf_layout_manager.h +++ b/ui/aura_shell/shelf_layout_manager.h @@ -9,6 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/aura/layout_manager.h" +#include "ui/aura_shell/aura_shell_export.h" #include "ui/gfx/compositor/layer_animation_observer.h" #include "ui/gfx/insets.h" #include "ui/gfx/rect.h" @@ -23,8 +24,9 @@ namespace internal { // ShelfLayoutManager is a layout manager responsible for the launcher. // Also supports showing and hiding the launcher/status area // as well as positioning them. -class ShelfLayoutManager : public aura::LayoutManager, - public ui::LayerAnimationObserver { +// Exported for unit tests. +class AURA_SHELL_EXPORT ShelfLayoutManager : public aura::LayoutManager, + public ui::LayerAnimationObserver { public: ShelfLayoutManager(views::Widget* launcher, views::Widget* status); virtual ~ShelfLayoutManager(); |