summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 17:09:17 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 17:09:17 +0000
commit5dd2892952df15a938be47e8d6fbf679952733e6 (patch)
tree5b3a6ec68404282b2582834d16969bd87ab45f56 /chrome/chrome_browser.gypi
parentbb007d4da961915d7e0b4c70c369a03d0f36c3db (diff)
downloadchromium_src-5dd2892952df15a938be47e8d6fbf679952733e6.zip
chromium_src-5dd2892952df15a938be47e8d6fbf679952733e6.tar.gz
chromium_src-5dd2892952df15a938be47e8d6fbf679952733e6.tar.bz2
Add constrained DOMUI support for ChromeOS.
BUG=chromium-os:7217 TEST=None. Test until some constrained DOMUI is submitted. Review URL: http://codereview.chromium.org/4662003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 01e9290..e1133aa 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3028,6 +3028,7 @@
'browser/ui/views/collected_cookies_win.h',
'browser/ui/views/confirm_message_box_dialog.cc',
'browser/ui/views/confirm_message_box_dialog.h',
+ 'browser/ui/views/constrained_html_delegate_gtk.cc',
'browser/ui/views/constrained_html_delegate_win.cc',
'browser/ui/views/constrained_window_win.cc',
'browser/ui/views/constrained_window_win.h',
@@ -3798,6 +3799,7 @@
['include', '^browser/ui/views/chrome_views_delegate.cc'],
['include', '^browser/ui/views/clear_browsing_data.cc'],
['include', '^browser/ui/views/clear_browsing_data.h'],
+ ['include', '^browser/ui/views/constrained_html_delegate_gtk.cc'],
['include', '^browser/ui/views/content_setting_bubble_contents.cc'],
['include', '^browser/ui/views/content_setting_bubble_contents.h'],
['include', '^browser/ui/views/create_application_shortcut_view.cc'],
@@ -4240,7 +4242,7 @@
{
# Protobuf compiler / generate rule for google apps policy
# TODO(danno): This rule shares a lot with the user feedback proto rule
- # and probably should be generalized to handle both
+ # and probably should be generalized to handle both
'target_name': 'device_management_backend_proto',
'type': 'none',
'sources': [