summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 18:44:51 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 18:44:51 +0000
commitf941f47a837bc6d98937acc6a13603bb7c06d286 (patch)
tree50585ebe530e0a03029c84654a77658d43e27f52 /ui/ui.gyp
parent6c32a71b9847fddb0946677ee926f88fd340691c (diff)
downloadchromium_src-f941f47a837bc6d98937acc6a13603bb7c06d286.zip
chromium_src-f941f47a837bc6d98937acc6a13603bb7c06d286.tar.gz
chromium_src-f941f47a837bc6d98937acc6a13603bb7c06d286.tar.bz2
Wires keeping the launcher up to date with the browser. I also needed GetBrowserViewForNativeWindow, so I had to wire up ViewProps for it to work correctly.
BUG=97262 TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/8289022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
-rw-r--r--ui/ui.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index e69790e..e268b8e 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -478,8 +478,6 @@
'base/dragdrop/drop_target.cc',
'base/dragdrop/drop_target.h',
'base/dragdrop/os_exchange_data.cc',
- 'base/view_prop.cc',
- 'base/view_prop.h',
'gfx/native_theme_win.cc',
'gfx/native_theme_win.h',
],
@@ -541,6 +539,8 @@
}],
['toolkit_views==0', {
'sources!': [
+ 'base/view_prop.cc',
+ 'base/view_prop.h',
'gfx/render_text.cc',
'gfx/render_text.h',
'gfx/render_text_linux.cc',