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/plugin_prefs_factory.cc

Issue 10911137: Remove bundled NPAPI Flash on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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/plugin_prefs.cc ('k') | chrome/common/chrome_content_client.cc » ('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 (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/plugin_prefs_factory.h" 5 #include "chrome/browser/plugin_prefs_factory.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "chrome/browser/plugin_prefs.h" 8 #include "chrome/browser/plugin_prefs.h"
9 #include "chrome/browser/prefs/pref_service.h" 9 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir); 52 PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir);
53 prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory, 53 prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,
54 internal_dir, 54 internal_dir,
55 PrefService::UNSYNCABLE_PREF); 55 PrefService::UNSYNCABLE_PREF);
56 prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF, 56 prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF,
57 false, 57 false,
58 PrefService::UNSYNCABLE_PREF); 58 PrefService::UNSYNCABLE_PREF);
59 prefs->RegisterBooleanPref(prefs::kPluginsEnabledNaCl, 59 prefs->RegisterBooleanPref(prefs::kPluginsEnabledNaCl,
60 false, 60 false,
61 PrefService::UNSYNCABLE_PREF); 61 PrefService::UNSYNCABLE_PREF);
62 prefs->RegisterBooleanPref(prefs::kPluginsMigratedToPepperFlash,
63 false,
64 PrefService::UNSYNCABLE_PREF);
62 prefs->RegisterListPref(prefs::kPluginsPluginsList, 65 prefs->RegisterListPref(prefs::kPluginsPluginsList,
63 PrefService::UNSYNCABLE_PREF); 66 PrefService::UNSYNCABLE_PREF);
64 prefs->RegisterListPref(prefs::kPluginsDisabledPlugins, 67 prefs->RegisterListPref(prefs::kPluginsDisabledPlugins,
65 PrefService::UNSYNCABLE_PREF); 68 PrefService::UNSYNCABLE_PREF);
66 prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions, 69 prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,
67 PrefService::UNSYNCABLE_PREF); 70 PrefService::UNSYNCABLE_PREF);
68 prefs->RegisterListPref(prefs::kPluginsEnabledPlugins, 71 prefs->RegisterListPref(prefs::kPluginsEnabledPlugins,
69 PrefService::UNSYNCABLE_PREF); 72 PrefService::UNSYNCABLE_PREF);
70 } 73 }
71 74
72 bool PluginPrefsFactory::ServiceRedirectedInIncognito() { 75 bool PluginPrefsFactory::ServiceRedirectedInIncognito() {
73 return true; 76 return true;
74 } 77 }
75 78
76 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() { 79 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() {
77 return true; 80 return true;
78 } 81 }
79 82
80 bool PluginPrefsFactory::ServiceIsCreatedWithProfile() { 83 bool PluginPrefsFactory::ServiceIsCreatedWithProfile() {
81 return true; 84 return true;
82 } 85 }
OLDNEW
« no previous file with comments | « chrome/browser/plugin_prefs.cc ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698