chrome/browser/plugins/plugin_prefs_factory.cc - Issue 12388012: Ignore the disabled state of component-updated PPAPI Flash for once.

Side by Side Diff: chrome/browser/plugins/plugin_prefs_factory.cc

Issue 12388012: Ignore the disabled state of component-updated PPAPI Flash for once. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 7 years, 9 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/plugins/plugin_prefs.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

OLD	NEW
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/plugins/plugin_prefs_factory.h"	5 #include "chrome/browser/plugins/plugin_prefs_factory.h"

6	6

7 #include "base/path_service.h"	7 #include "base/path_service.h"

8 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

9 #include "chrome/browser/plugins/plugin_prefs.h"	9 #include "chrome/browser/plugins/plugin_prefs.h"

10 #include "chrome/browser/prefs/pref_registry_syncable.h"	10 #include "chrome/browser/prefs/pref_registry_syncable.h"

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 PrefRegistrySyncable::UNSYNCABLE_PREF);	56 PrefRegistrySyncable::UNSYNCABLE_PREF);

57 registry->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF,	57 registry->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF,

58 false,	58 false,

59 PrefRegistrySyncable::UNSYNCABLE_PREF);	59 PrefRegistrySyncable::UNSYNCABLE_PREF);

60 registry->RegisterBooleanPref(prefs::kPluginsEnabledNaCl,	60 registry->RegisterBooleanPref(prefs::kPluginsEnabledNaCl,

61 false,	61 false,

62 PrefRegistrySyncable::UNSYNCABLE_PREF);	62 PrefRegistrySyncable::UNSYNCABLE_PREF);

63 registry->RegisterBooleanPref(prefs::kPluginsMigratedToPepperFlash,	63 registry->RegisterBooleanPref(prefs::kPluginsMigratedToPepperFlash,

64 false,	64 false,

65 PrefRegistrySyncable::UNSYNCABLE_PREF);	65 PrefRegistrySyncable::UNSYNCABLE_PREF);

	66 registry->RegisterBooleanPref(

	67 prefs::kPluginsRemovedOldComponentPepperFlashSettings,

	68 false,

	69 PrefRegistrySyncable::UNSYNCABLE_PREF);

66 registry->RegisterListPref(prefs::kPluginsPluginsList,	70 registry->RegisterListPref(prefs::kPluginsPluginsList,

67 PrefRegistrySyncable::UNSYNCABLE_PREF);	71 PrefRegistrySyncable::UNSYNCABLE_PREF);

68 registry->RegisterListPref(prefs::kPluginsDisabledPlugins,	72 registry->RegisterListPref(prefs::kPluginsDisabledPlugins,

69 PrefRegistrySyncable::UNSYNCABLE_PREF);	73 PrefRegistrySyncable::UNSYNCABLE_PREF);

70 registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,	74 registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,

71 PrefRegistrySyncable::UNSYNCABLE_PREF);	75 PrefRegistrySyncable::UNSYNCABLE_PREF);

72 registry->RegisterListPref(prefs::kPluginsEnabledPlugins,	76 registry->RegisterListPref(prefs::kPluginsEnabledPlugins,

73 PrefRegistrySyncable::UNSYNCABLE_PREF);	77 PrefRegistrySyncable::UNSYNCABLE_PREF);

74 }	78 }

75	79

76 bool PluginPrefsFactory::ServiceRedirectedInIncognito() const {	80 bool PluginPrefsFactory::ServiceRedirectedInIncognito() const {

77 return true;	81 return true;

78 }	82 }

79	83

80 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const {	84 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const {

81 return true;	85 return true;

82 }	86 }

83	87

84 bool PluginPrefsFactory::ServiceIsCreatedWithProfile() const {	88 bool PluginPrefsFactory::ServiceIsCreatedWithProfile() const {

85 return true;	89 return true;

86 }	90 }

OLD	NEW