diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 19:50:30 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 19:50:30 +0000 |
| commit | 05a3a86b3af49f110ba5f5f60b02f889e8881eff (patch) | |
| tree | a4cb30472b731bfb6bd54164b1c306cae279ee90 /views/views.gyp | |
| parent | fcb79b5c168c96495641cb431c351a4b10d16555 (diff) | |
| download | chromium_src-05a3a86b3af49f110ba5f5f60b02f889e8881eff.zip chromium_src-05a3a86b3af49f110ba5f5f60b02f889e8881eff.tar.gz chromium_src-05a3a86b3af49f110ba5f5f60b02f889e8881eff.tar.bz2 | |
Move bubble border under views/bubble.
This is a redo of http://codereview.chromium.org/7629009/
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/7720011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/views/views.gyp b/views/views.gyp index 7e5ca8a..c5e5a27 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -39,6 +39,7 @@ '../ui/gfx/compositor/compositor.gyp:compositor', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', + '../ui/ui.gyp:ui_resources_standard', ], 'defines': [ 'VIEWS_IMPLEMENTATION', @@ -55,6 +56,8 @@ 'background.h', 'border.cc', 'border.h', + 'bubble/bubble_border.cc', + 'bubble/bubble_border.h', 'context_menu_controller.h', 'controls/button/button.cc', 'controls/button/button.h', @@ -450,6 +453,7 @@ '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', + '../ui/ui.gyp:ui_resources_standard', 'views', ], 'include_dirs': [ @@ -487,6 +491,7 @@ 'widget/widget_unittest.cc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', ], 'conditions': [ ['toolkit_uses_gtk == 1', { @@ -547,6 +552,7 @@ '../ui/ui.gyp:ui', '../ui/ui.gyp:gfx_resources', '../ui/ui.gyp:ui_resources', + '../ui/ui.gyp:ui_resources_standard', 'views', ], 'include_dirs': [ @@ -593,6 +599,7 @@ 'test/test_views_delegate.h', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', ], 'conditions': [ ['toolkit_uses_gtk == 1', { @@ -692,6 +699,7 @@ '../ui/ui.gyp:gfx_resources', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', + '../ui/ui.gyp:ui_resources_standard', 'views', 'views_desktop_lib', ], @@ -704,6 +712,7 @@ 'desktop/desktop_views_delegate.h', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', ], 'conditions': [ ['toolkit_uses_gtk == 1', { |