summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-11 09:32:12 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-11 09:32:12 +0000
commit54a337516820c79a368a8bbca2aa2da9944cfb5c (patch)
tree14850789dc739e6618de5f51e04a9a35ccc82ed2 /ui/ui.gyp
parente5c45f6c5f6778f1da0053ccbb8d95a15bdbcc14 (diff)
downloadchromium_src-54a337516820c79a368a8bbca2aa2da9944cfb5c.zip
chromium_src-54a337516820c79a368a8bbca2aa2da9944cfb5c.tar.gz
chromium_src-54a337516820c79a368a8bbca2aa2da9944cfb5c.tar.bz2
Revert r131737 "Use template for Point/Size/Rect and remove duplicates "
TBR=oshima@chromium.org BUG=114664 TEST=none Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=131737 Review URL: https://chromiumcodereview.appspot.com/10020034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
-rw-r--r--ui/ui.gyp9
1 files changed, 2 insertions, 7 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 61cf110..1820dd8 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -263,6 +263,7 @@
'base/win/singleton_hwnd.h',
'base/win/window_impl.cc',
'base/win/window_impl.h',
+ 'base/work_area_watcher_observer.h',
'base/x/active_window_watcher_x.cc',
'base/x/active_window_watcher_x.h',
'base/x/active_window_watcher_x_observer.h',
@@ -271,7 +272,6 @@
'base/x/root_window_property_watcher_x.h',
'base/x/work_area_watcher_x.cc',
'base/x/work_area_watcher_x.h',
- 'base/x/work_area_watcher_x_observer.h',
'base/x/x11_util.cc',
'base/x/x11_util.h',
'base/x/x11_util_internal.h',
@@ -347,11 +347,8 @@
'gfx/platform_font_win.cc',
'gfx/point.cc',
'gfx/point.h',
- 'gfx/point_base.h',
'gfx/rect.cc',
'gfx/rect.h',
- 'gfx/rect_base.h',
- 'gfx/rect_base_impl.h',
'gfx/render_text.cc',
'gfx/render_text.h',
'gfx/render_text_linux.cc',
@@ -375,8 +372,6 @@
'gfx/shadow_value.h',
'gfx/size.cc',
'gfx/size.h',
- 'gfx/size_base.h',
- 'gfx/size_base_impl.h',
'gfx/skbitmap_operations.cc',
'gfx/skbitmap_operations.h',
'gfx/skia_util.cc',
@@ -424,6 +419,7 @@
['exclude', 'base/view_prop.h'],
['exclude', 'base/win/mouse_wheel_util.cc'],
['exclude', 'base/win/mouse_wheel_util.h'],
+ ['exclude', 'base/work_area_watcher_observer.h'],
['exclude', 'base/x/active_window_watcher_x.cc'],
['exclude', 'base/x/active_window_watcher_x.h'],
['exclude', 'base/x/active_window_watcher_x_observer.h'],
@@ -431,7 +427,6 @@
['exclude', 'base/x/root_window_property_watcher_x.h'],
['exclude', 'base/x/work_area_watcher_x.cc'],
['exclude', 'base/x/work_area_watcher_x.h'],
- ['exclude', 'base/x/work_area_watcher_x_observer.h'],
['exclude', 'ui_controls_win.cc'],
],
}, { # use_aura!=1