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

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

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: . Created 3 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:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_factory.h" 5 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
6 6
7 #include <limits.h> 7 #include <limits.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 base::Value::Type::STRING }, 424 base::Value::Type::STRING },
425 { key::kForceEphemeralProfiles, 425 { key::kForceEphemeralProfiles,
426 prefs::kForceEphemeralProfiles, 426 prefs::kForceEphemeralProfiles,
427 base::Value::Type::BOOLEAN }, 427 base::Value::Type::BOOLEAN },
428 { key::kSSLVersionMax, 428 { key::kSSLVersionMax,
429 ssl_config::prefs::kSSLVersionMax, 429 ssl_config::prefs::kSSLVersionMax,
430 base::Value::Type::STRING }, 430 base::Value::Type::STRING },
431 { key::kNTPContentSuggestionsEnabled, 431 { key::kNTPContentSuggestionsEnabled,
432 ntp_snippets::prefs::kEnableSnippets, 432 ntp_snippets::prefs::kEnableSnippets,
433 base::Value::Type::BOOLEAN }, 433 base::Value::Type::BOOLEAN },
434 #if defined(ENABLE_MEDIA_ROUTER)
435 { key::kEnableMediaRouter, 434 { key::kEnableMediaRouter,
436 prefs::kEnableMediaRouter, 435 prefs::kEnableMediaRouter,
437 base::Value::Type::BOOLEAN }, 436 base::Value::Type::BOOLEAN },
438 #if !defined(OS_ANDROID) 437 #if !defined(OS_ANDROID)
439 { key::kShowCastIconInToolbar, 438 { key::kShowCastIconInToolbar,
440 prefs::kShowCastIconInToolbar, 439 prefs::kShowCastIconInToolbar,
441 base::Value::Type::BOOLEAN }, 440 base::Value::Type::BOOLEAN },
442 #endif // !defined(OS_ANDROID) 441 #endif // !defined(OS_ANDROID)
443 #endif // defined(ENABLE_MEDIA_ROUTER)
444 #if BUILDFLAG(ENABLE_WEBRTC) 442 #if BUILDFLAG(ENABLE_WEBRTC)
445 { key::kWebRtcUdpPortRange, 443 { key::kWebRtcUdpPortRange,
446 prefs::kWebRTCUDPPortRange, 444 prefs::kWebRTCUDPPortRange,
447 base::Value::Type::STRING }, 445 base::Value::Type::STRING },
448 #endif // BUILDFLAG(ENABLE_WEBRTC) 446 #endif // BUILDFLAG(ENABLE_WEBRTC)
449 #if !defined(OS_MACOSX) 447 #if !defined(OS_MACOSX)
450 { key::kFullscreenAllowed, 448 { key::kFullscreenAllowed,
451 prefs::kFullscreenAllowed, 449 prefs::kFullscreenAllowed,
452 base::Value::Type::BOOLEAN }, 450 base::Value::Type::BOOLEAN },
453 #if BUILDFLAG(ENABLE_EXTENSIONS) 451 #if BUILDFLAG(ENABLE_EXTENSIONS)
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
1036 #endif // defined(OS_CHROMEOS) 1034 #endif // defined(OS_CHROMEOS)
1037 1035
1038 #if BUILDFLAG(ENABLE_PLUGINS) 1036 #if BUILDFLAG(ENABLE_PLUGINS)
1039 handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>()); 1037 handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>());
1040 #endif // BUILDFLAG(ENABLE_PLUGINS) 1038 #endif // BUILDFLAG(ENABLE_PLUGINS)
1041 1039
1042 return handlers; 1040 return handlers;
1043 } 1041 }
1044 1042
1045 } // namespace policy 1043 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/media/router/media_router_ui_service_factory.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698