summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorgwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-25 19:06:28 +0000
committergwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-25 19:06:28 +0000
commit64134fec4ed2f78dde84c6533dd2cc962f365ae6 (patch)
tree5a40bcf928d3476b44722950fe1fb7c131013337 /chrome/chrome.gyp
parentd1279211a457750c5b8717fe6790a838061632a8 (diff)
downloadchromium_src-64134fec4ed2f78dde84c6533dd2cc962f365ae6.zip
chromium_src-64134fec4ed2f78dde84c6533dd2cc962f365ae6.tar.gz
chromium_src-64134fec4ed2f78dde84c6533dd2cc962f365ae6.tar.bz2
Adds basic group policy support. Does not wire the settings to the preferences yet, but at least adds support for looking in the right place.
R=cpu,kuchhal TEST=unit test included BUG=19374 Review URL: http://codereview.chromium.org/405003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rwxr-xr-xchrome/chrome.gyp11
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b2ab988..b7755f4 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1510,6 +1510,10 @@
'browser/google_url_tracker.h',
'browser/google_util.cc',
'browser/google_util.h',
+ 'browser/group_policy.h',
+ 'browser/group_policy.cc',
+ 'browser/group_policy_settings.h',
+ 'browser/group_policy_settings.cc',
'browser/gtk/about_chrome_dialog.cc',
'browser/gtk/about_chrome_dialog.h',
'browser/gtk/back_forward_button_gtk.cc',
@@ -3112,6 +3116,10 @@
'browser/ime_input.cc',
'browser/importer/ie_importer.cc',
'browser/jumplist.cc',
+ 'browser/group_policy.h',
+ 'browser/group_policy.cc',
+ 'browser/group_policy_settings.h',
+ 'browser/group_policy_settings.cc',
'browser/sandbox_policy.cc',
],
}],
@@ -4673,6 +4681,7 @@
'browser/global_keyboard_shortcuts_mac_unittest.cc',
'browser/google_url_tracker_unittest.cc',
'browser/google_update_settings_posix_unittest.cc',
+ 'browser/group_policy_unittest.cc',
'browser/gtk/bookmark_bar_gtk_unittest.cc',
'browser/gtk/bookmark_editor_gtk_unittest.cc',
'browser/gtk/gtk_theme_provider_unittest.cc',
@@ -4865,6 +4874,7 @@
],
'sources!': [
'browser/views/bookmark_context_menu_test.cc',
+ 'browser/group_policy_unittest.cc',
'browser/gtk/options/cookies_view_unittest.cc',
# Compact Language Detection (cld) is not supported in linux yet.
'../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
@@ -4911,6 +4921,7 @@
'sources!': [
'browser/views/bookmark_context_menu_test.cc',
'browser/back_forward_menu_model_unittest.cc',
+ 'browser/group_policy_unittest.cc',
'browser/gtk/go_button_gtk_unittest.cc',
'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
'browser/tab_contents/navigation_controller_unittest.cc',