diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-08 22:59:44 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-08 22:59:44 +0000 |
| commit | e87687feb9cace286a412def5e199033d3fe4fd1 (patch) | |
| tree | 6a3d5241cf94e12110ba642c819516431c489f25 /ui/aura_shell | |
| parent | c750bb202fef68a9521c1ae8e1dec8bd74146be5 (diff) | |
| download | chromium_src-e87687feb9cace286a412def5e199033d3fe4fd1.zip chromium_src-e87687feb9cace286a412def5e199033d3fe4fd1.tar.gz chromium_src-e87687feb9cace286a412def5e199033d3fe4fd1.tar.bz2 | |
Gets component build to work with aura. As part of this I needed to
break screen_aura in two. Otherwise we end up with a circular
dependency between ui and aura.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8205018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/aura_shell.gyp | 3 | ||||
| -rw-r--r-- | ui/aura_shell/desktop_layout_manager.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp index cbae29f..6ad6874 100644 --- a/ui/aura_shell/aura_shell.gyp +++ b/ui/aura_shell/aura_shell.gyp @@ -28,6 +28,9 @@ '../ui.gyp:ui_resources', '../ui.gyp:ui_resources_standard', ], + 'defines': [ + 'AURA_SHELL_IMPLEMENTATION', + ], 'sources': [ # All .cc, .h under views, except unittests 'desktop_background_view.cc', diff --git a/ui/aura_shell/desktop_layout_manager.h b/ui/aura_shell/desktop_layout_manager.h index 9afc89a..28e1f02 100644 --- a/ui/aura_shell/desktop_layout_manager.h +++ b/ui/aura_shell/desktop_layout_manager.h @@ -22,7 +22,7 @@ namespace internal { // A layout manager for the root window. // Resizes all of its immediate children to fill the bounds of the root window. -class AURA_SHELL_EXPORT DesktopLayoutManager : public aura::LayoutManager { +class DesktopLayoutManager : public aura::LayoutManager { public: explicit DesktopLayoutManager(aura::Window* owner); virtual ~DesktopLayoutManager(); |