| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 # This data is in a separate file so that src/chrome/app/policy/PRESUBMIT.py | 6 # This data is in a separate file so that src/chrome/app/policy/PRESUBMIT.py |
| 7 # can load it too without having to load pyautolib. | 7 # can load it too without having to load pyautolib. |
| 8 | 8 |
| 9 # DO NOT import pyauto from here! This file is required to run a presubmit | 9 # DO NOT import pyauto from here! This file is required to run a presubmit |
| 10 # scripts that will always fail if pyautolib isn't available, which is common. | 10 # scripts that will always fail if pyautolib isn't available, which is common. |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 # TODO(joaodasilva): Should be BROWSER. http://crbug.com/97749 | 163 # TODO(joaodasilva): Should be BROWSER. http://crbug.com/97749 |
| 164 'DefaultSearchProviderSearchURL': | 164 'DefaultSearchProviderSearchURL': |
| 165 (None, 'http://www.google.com/?q={searchTerms}', [], OS_ALL), | 165 (None, 'http://www.google.com/?q={searchTerms}', [], OS_ALL), |
| 166 'DefaultSearchProviderSuggestURL': | 166 'DefaultSearchProviderSuggestURL': |
| 167 (None, 'http://www.google.com/suggest?q={searchTerms}', [], OS_ALL), | 167 (None, 'http://www.google.com/suggest?q={searchTerms}', [], OS_ALL), |
| 168 'DefaultSearchProviderInstantURL': | 168 'DefaultSearchProviderInstantURL': |
| 169 (None, 'http://www.google.com/instant?q={searchTerms}', [], OS_ALL), | 169 (None, 'http://www.google.com/instant?q={searchTerms}', [], OS_ALL), |
| 170 'DefaultSearchProviderIconURL': | 170 'DefaultSearchProviderIconURL': |
| 171 (None, 'http://www.google.com/favicon.ico', [], OS_ALL), | 171 (None, 'http://www.google.com/favicon.ico', [], OS_ALL), |
| 172 'DefaultSearchProviderEncodings': (None, ['UTF-8'], [], OS_ALL), | 172 'DefaultSearchProviderEncodings': (None, ['UTF-8'], [], OS_ALL), |
| 173 'DefaultSearchProviderAlternateURLs': |
| 174 (None, 'http://www.google.com/?q={searchTerms},' + |
| 175 'http://www.google.com/instant#q={searchTerms}', [], OS_ALL), |
| 173 'DefaultCookiesSetting': | 176 'DefaultCookiesSetting': |
| 174 ('kManagedDefaultCookiesSetting', 2, [CONTENT], OS_ALL), | 177 ('kManagedDefaultCookiesSetting', 2, [CONTENT], OS_ALL), |
| 175 'DefaultImagesSetting': | 178 'DefaultImagesSetting': |
| 176 ('kManagedDefaultImagesSetting', 2, [CONTENT], OS_ALL), | 179 ('kManagedDefaultImagesSetting', 2, [CONTENT], OS_ALL), |
| 177 'DefaultJavaScriptSetting': (None, 2, [CONTENT], OS_ALL), | 180 'DefaultJavaScriptSetting': (None, 2, [CONTENT], OS_ALL), |
| 178 'DefaultPluginsSetting': | 181 'DefaultPluginsSetting': |
| 179 ('kManagedDefaultPluginsSetting', 2, [CONTENT], OS_ALL), | 182 ('kManagedDefaultPluginsSetting', 2, [CONTENT], OS_ALL), |
| 180 'DefaultPopupsSetting': | 183 'DefaultPopupsSetting': |
| 181 ('kManagedDefaultPopupsSetting', 2, [CONTENT], OS_ALL), | 184 ('kManagedDefaultPopupsSetting', 2, [CONTENT], OS_ALL), |
| 182 'DefaultNotificationsSetting': | 185 'DefaultNotificationsSetting': |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 'SystemTimezone': (None, 'Europe/Brussels', [], ['chromeos']), | 306 'SystemTimezone': (None, 'Europe/Brussels', [], ['chromeos']), |
| 304 | 307 |
| 305 # Chrome Frame policies: | 308 # Chrome Frame policies: |
| 306 'ChromeFrameRendererSettings': (None, 0, [], []), | 309 'ChromeFrameRendererSettings': (None, 0, [], []), |
| 307 'RenderInChromeFrameList': (None, ['google.com'], [], []), | 310 'RenderInChromeFrameList': (None, ['google.com'], [], []), |
| 308 'RenderInHostList': (None, ['google.com'], [], []), | 311 'RenderInHostList': (None, ['google.com'], [], []), |
| 309 'ChromeFrameContentTypes': (None, ['text/xml'], [], []), | 312 'ChromeFrameContentTypes': (None, ['text/xml'], [], []), |
| 310 'GCFUserDataDir': (None, '${user_name}/test-frame', [], []), | 313 'GCFUserDataDir': (None, '${user_name}/test-frame', [], []), |
| 311 'AdditionalLaunchParameters': (None, '--enable-media-stream', [], []), | 314 'AdditionalLaunchParameters': (None, '--enable-media-stream', [], []), |
| 312 } | 315 } |
| OLD | NEW |