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

Side by Side Diff: extensions/browser/extension_prefs.cc

Issue 499253002: Revert of Merge apps/pref* to extensions/browser/pref* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 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
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_impl.cc ('k') | extensions/browser/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/browser/extension_prefs.h" 5 #include "extensions/browser/extension_prefs.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/prefs/pref_notifier.h" 10 #include "base/prefs/pref_notifier.h"
(...skipping 1977 matching lines...) Expand 10 before | Expand all | Expand 10 after
1988 registry->RegisterListPref(pref_names::kNativeMessagingWhitelist, 1988 registry->RegisterListPref(pref_names::kNativeMessagingWhitelist,
1989 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 1989 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
1990 registry->RegisterBooleanPref( 1990 registry->RegisterBooleanPref(
1991 pref_names::kNativeMessagingUserLevelHosts, 1991 pref_names::kNativeMessagingUserLevelHosts,
1992 true, // default value 1992 true, // default value
1993 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 1993 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
1994 registry->RegisterIntegerPref( 1994 registry->RegisterIntegerPref(
1995 kCorruptedDisableCount, 1995 kCorruptedDisableCount,
1996 0, // default value 1996 0, // default value
1997 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 1997 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
1998
1999 #if !defined(OS_MACOSX)
2000 registry->RegisterBooleanPref(
2001 pref_names::kAppFullscreenAllowed, true,
2002 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
2003 #endif
2004 } 1998 }
2005 1999
2006 template <class ExtensionIdContainer> 2000 template <class ExtensionIdContainer>
2007 bool ExtensionPrefs::GetUserExtensionPrefIntoContainer( 2001 bool ExtensionPrefs::GetUserExtensionPrefIntoContainer(
2008 const char* pref, 2002 const char* pref,
2009 ExtensionIdContainer* id_container_out) { 2003 ExtensionIdContainer* id_container_out) {
2010 DCHECK(id_container_out->empty()); 2004 DCHECK(id_container_out->empty());
2011 2005
2012 const base::Value* user_pref_value = prefs_->GetUserPrefValue(pref); 2006 const base::Value* user_pref_value = prefs_->GetUserPrefValue(pref);
2013 const base::ListValue* user_pref_as_list; 2007 const base::ListValue* user_pref_as_list;
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
2186 extension_pref_value_map_->RegisterExtension( 2180 extension_pref_value_map_->RegisterExtension(
2187 extension_id, install_time, is_enabled, is_incognito_enabled); 2181 extension_id, install_time, is_enabled, is_incognito_enabled);
2188 2182
2189 FOR_EACH_OBSERVER( 2183 FOR_EACH_OBSERVER(
2190 ExtensionPrefsObserver, 2184 ExtensionPrefsObserver,
2191 observer_list_, 2185 observer_list_,
2192 OnExtensionRegistered(extension_id, install_time, is_enabled)); 2186 OnExtensionRegistered(extension_id, install_time, is_enabled));
2193 } 2187 }
2194 2188
2195 } // namespace extensions 2189 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_impl.cc ('k') | extensions/browser/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698