chrome/chrome_browser.gypi - Issue 6869042: Add immutable settings checks when handling policy.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_browser.gypi

Issue 6869042: Add immutable settings checks when handling policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, address comments Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index fcfab617e8db9c9026eefe292300bbb4503ac018..b97533557ca45bd36381776e356afd078aa36964 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1554,6 +1554,8 @@

'browser/policy/device_token_fetcher.h',

'browser/policy/dummy_configuration_policy_provider.cc',

'browser/policy/dummy_configuration_policy_provider.h',

+ 'browser/policy/enterprise_install_attributes.cc',

+ 'browser/policy/enterprise_install_attributes.h',

'browser/policy/file_based_policy_loader.cc',

'browser/policy/file_based_policy_loader.h',

'browser/policy/file_based_policy_provider.cc',

@@ -3433,10 +3435,14 @@

['exclude', 'browser/extensions/file_manager_util.cc'],

['exclude', 'browser/oom_priority_manager.cc'],

['exclude', 'browser/oom_priority_manager.h'],

- ['exclude', 'browser/policy/device_policy_cache\\.(h|cc)'],

+ ['exclude', 'browser/policy/device_policy_cache.cc'],

+ ['exclude', 'browser/policy/device_policy_cache.h'],

+ ['exclude', 'browser/policy/enterprise_install_attributes.cc'],

+ ['exclude', 'browser/policy/enterprise_install_attributes.h'],

['exclude', 'browser/policy/device_policy_identity_strategy.cc'],

['exclude', 'browser/policy/device_policy_identity_strategy.h'],

- ['exclude', 'browser/policy/proto/chrome_device_policy\\.pb\\.(h|cc)'],

+ ['exclude', 'browser/policy/proto/chrome_device_policy.pb.cc'],

+ ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'],

['exclude', 'browser/renderer_host/offline_resource_handler.cc'],

['exclude', 'browser/renderer_host/offline_resource_handler.h'],

['exclude', 'browser/ui/login/login_prompt_ui.cc'],