chrome/chrome_tests.gypi - Issue 3067017: Merge 53457 - Disable proxy config button and show banner if proxy prefs are managed.

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_tests.gypi

Issue 3067017: Merge 53457 - Disable proxy config button and show banner if proxy prefs are managed. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 5 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/chrome_tests.gypi

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

index 84c993fb1ce6d390dcfb8eb9f359c373affbd7a0..dba11c6ed593a758a2e9464006a14ef54cfc242f 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -116,6 +116,8 @@

'test/profile_mock.h',

'test/test_browser_window.h',

'test/test_location_bar.h',

+ 'test/testing_pref_service.cc',

+ 'test/testing_pref_service.h',

'test/testing_profile.cc',

'test/testing_profile.h',

'test/thread_observer_helper.h',

@@ -985,7 +987,6 @@

'browser/in_process_webkit/dom_storage_dispatcher_host_unittest.cc',

'browser/in_process_webkit/webkit_context_unittest.cc',

'browser/in_process_webkit/webkit_thread_unittest.cc',

- 'browser/pref_value_store_unittest.cc',

'browser/keychain_mock_mac.cc',

'browser/keychain_mock_mac.h',

'browser/login_prompt_unittest.cc',

@@ -1021,6 +1022,8 @@

'browser/password_manager/password_store_win_unittest.cc',

'browser/pref_member_unittest.cc',

'browser/pref_service_unittest.cc',

+ 'browser/pref_set_observer_unittest.cc',

+ 'browser/pref_value_store_unittest.cc',

'browser/preferences_mock_mac.cc',

'browser/preferences_mock_mac.h',

'browser/printing/print_dialog_cloud_unittest.cc',

« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/test/testing_pref_service.h » ('j') | no next file with comments »