Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Side by Side Diff: chrome/browser/policy/configuration_policy_handler_list.cc

Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed sky's comment and replaced "Do not allow any site to" with "Do not allow sites to" Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/policy/configuration_policy_handler_list.h" 5 #include "chrome/browser/policy/configuration_policy_handler_list.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/policy/configuration_policy_handler.h" 9 #include "chrome/browser/policy/configuration_policy_handler.h"
10 #include "chrome/browser/policy/policy_error_map.h" 10 #include "chrome/browser/policy/policy_error_map.h"
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 Value::TYPE_STRING }, 275 Value::TYPE_STRING },
276 { key::kEnterpriseWebStoreName, 276 { key::kEnterpriseWebStoreName,
277 prefs::kEnterpriseWebStoreName, 277 prefs::kEnterpriseWebStoreName,
278 Value::TYPE_STRING }, 278 Value::TYPE_STRING },
279 { key::kEnableMemoryInfo, 279 { key::kEnableMemoryInfo,
280 prefs::kEnableMemoryInfo, 280 prefs::kEnableMemoryInfo,
281 Value::TYPE_BOOLEAN }, 281 Value::TYPE_BOOLEAN },
282 { key::kRestrictSigninToPattern, 282 { key::kRestrictSigninToPattern,
283 prefs::kGoogleServicesUsernamePattern, 283 prefs::kGoogleServicesUsernamePattern,
284 Value::TYPE_STRING }, 284 Value::TYPE_STRING },
285 { key::kDefaultMediaStreamSetting,
286 prefs::kManagedDefaultMediaStreamSetting,
287 Value::TYPE_INTEGER },
285 288
286 #if defined(OS_CHROMEOS) 289 #if defined(OS_CHROMEOS)
287 { key::kChromeOsLockOnIdleSuspend, 290 { key::kChromeOsLockOnIdleSuspend,
288 prefs::kEnableScreenLock, 291 prefs::kEnableScreenLock,
289 Value::TYPE_BOOLEAN }, 292 Value::TYPE_BOOLEAN },
290 { key::kChromeOsReleaseChannel, 293 { key::kChromeOsReleaseChannel,
291 prefs::kChromeOsReleaseChannel, 294 prefs::kChromeOsReleaseChannel,
292 Value::TYPE_STRING }, 295 Value::TYPE_STRING },
293 { key::kGDataDisabled, 296 { key::kGDataDisabled,
294 prefs::kDisableGData, 297 prefs::kDisableGData,
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 } 386 }
384 387
385 void ConfigurationPolicyHandlerList::PrepareForDisplaying( 388 void ConfigurationPolicyHandlerList::PrepareForDisplaying(
386 PolicyMap* policies) const { 389 PolicyMap* policies) const {
387 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; 390 std::vector<ConfigurationPolicyHandler*>::const_iterator handler;
388 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) 391 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler)
389 (*handler)->PrepareForDisplaying(policies); 392 (*handler)->PrepareForDisplaying(policies);
390 } 393 }
391 394
392 } // namespace policy 395 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/media/media_stream_devices_menu_model.cc ('k') | chrome/browser/resources/options2/content_settings.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698