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

Side by Side Diff: chrome/browser/ui/browser_ui_prefs.cc

Issue 1413393003: Change WebRTC IP handling policy from multiple booleans to an enum. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update GYP file with right order. Created 5 years, 1 month 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 (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/ui/browser_ui_prefs.h" 5 #include "chrome/browser/ui/browser_ui_prefs.h"
6 6
7 #include "base/prefs/pref_registry_simple.h" 7 #include "base/prefs/pref_registry_simple.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/prefs/scoped_user_pref_update.h" 9 #include "base/prefs/scoped_user_pref_update.h"
10 #include "chrome/browser/first_run/first_run.h" 10 #include "chrome/browser/first_run/first_run.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 #include "components/pref_registry/pref_registry_syncable.h" 13 #include "components/pref_registry/pref_registry_syncable.h"
14 #include "components/translate/core/common/translate_pref_names.h" 14 #include "components/translate/core/common/translate_pref_names.h"
15 #include "content/public/common/webrtc_ip_handling_policy.h"
15 16
16 namespace chrome { 17 namespace chrome {
17 18
18 void RegisterBrowserPrefs(PrefRegistrySimple* registry) { 19 void RegisterBrowserPrefs(PrefRegistrySimple* registry) {
19 registry->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex, 0); 20 registry->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex, 0);
20 registry->RegisterBooleanPref(prefs::kAllowFileSelectionDialogs, true); 21 registry->RegisterBooleanPref(prefs::kAllowFileSelectionDialogs, true);
21 registry->RegisterIntegerPref(prefs::kShowFirstRunBubbleOption, 22 registry->RegisterIntegerPref(prefs::kShowFirstRunBubbleOption,
22 first_run::FIRST_RUN_BUBBLE_DONT_SHOW); 23 first_run::FIRST_RUN_BUBBLE_DONT_SHOW);
23 } 24 }
24 25
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 registry->RegisterBooleanPref(prefs::kImportBookmarks, true); 96 registry->RegisterBooleanPref(prefs::kImportBookmarks, true);
96 registry->RegisterBooleanPref(prefs::kImportHistory, true); 97 registry->RegisterBooleanPref(prefs::kImportHistory, true);
97 registry->RegisterBooleanPref(prefs::kImportHomepage, true); 98 registry->RegisterBooleanPref(prefs::kImportHomepage, true);
98 registry->RegisterBooleanPref(prefs::kImportSavedPasswords, true); 99 registry->RegisterBooleanPref(prefs::kImportSavedPasswords, true);
99 registry->RegisterBooleanPref(prefs::kImportSearchEngine, true); 100 registry->RegisterBooleanPref(prefs::kImportSearchEngine, true);
100 registry->RegisterBooleanPref( 101 registry->RegisterBooleanPref(
101 prefs::kEnableDoNotTrack, 102 prefs::kEnableDoNotTrack,
102 false, 103 false,
103 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 104 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
104 #if defined(ENABLE_WEBRTC) 105 #if defined(ENABLE_WEBRTC)
106 // TODO(guoweis): Remove next 2 options at M50.
105 registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true); 107 registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true);
106 registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, true); 108 registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, true);
109 registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
110 content::kWebRTCIPHandlingDefault);
107 #endif 111 #endif
108 112
109 // Dictionaries to keep track of default tasks in the file browser. 113 // Dictionaries to keep track of default tasks in the file browser.
110 registry->RegisterDictionaryPref( 114 registry->RegisterDictionaryPref(
111 prefs::kDefaultTasksByMimeType, 115 prefs::kDefaultTasksByMimeType,
112 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 116 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
113 registry->RegisterDictionaryPref( 117 registry->RegisterDictionaryPref(
114 prefs::kDefaultTasksBySuffix, 118 prefs::kDefaultTasksBySuffix,
115 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 119 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
116 120
117 // We need to register the type of these preferences in order to query 121 // We need to register the type of these preferences in order to query
118 // them even though they're only typically controlled via policy. 122 // them even though they're only typically controlled via policy.
119 registry->RegisterBooleanPref(prefs::kPluginsAllowOutdated, false); 123 registry->RegisterBooleanPref(prefs::kPluginsAllowOutdated, false);
120 registry->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, false); 124 registry->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, false);
121 registry->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, true); 125 registry->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, true);
122 registry->RegisterBooleanPref(prefs::kHideWebStoreIcon, false); 126 registry->RegisterBooleanPref(prefs::kHideWebStoreIcon, false);
123 #if !defined(OS_MACOSX) 127 #if !defined(OS_MACOSX)
124 registry->RegisterBooleanPref(prefs::kFullscreenAllowed, true); 128 registry->RegisterBooleanPref(prefs::kFullscreenAllowed, true);
125 #endif 129 #endif
126 } 130 }
127 131
128 } // namespace chrome 132 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/renderer_preferences_util.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698