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

Side by Side Diff: chrome/browser/ui/webui/plugins_ui.cc

Issue 7693030: Add a preference to force enable the NaCl plugin as we transition to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/webui/plugins_ui.h" 5 #include "chrome/browser/ui/webui/plugins_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 LoadDataResourceBytes(IDR_PLUGIN); 327 LoadDataResourceBytes(IDR_PLUGIN);
328 } 328 }
329 329
330 // static 330 // static
331 void PluginsUI::RegisterUserPrefs(PrefService* prefs) { 331 void PluginsUI::RegisterUserPrefs(PrefService* prefs) {
332 prefs->RegisterListPref(prefs::kPluginsPluginsList, 332 prefs->RegisterListPref(prefs::kPluginsPluginsList,
333 PrefService::UNSYNCABLE_PREF); 333 PrefService::UNSYNCABLE_PREF);
334 prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF, 334 prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF,
335 false, 335 false,
336 PrefService::UNSYNCABLE_PREF); 336 PrefService::UNSYNCABLE_PREF);
337 prefs->RegisterBooleanPref(prefs::kPluginsEnabledNaCl,
338 false,
339 PrefService::UNSYNCABLE_PREF);
337 prefs->RegisterBooleanPref(prefs::kPluginsShowDetails, 340 prefs->RegisterBooleanPref(prefs::kPluginsShowDetails,
338 false, 341 false,
339 PrefService::UNSYNCABLE_PREF); 342 PrefService::UNSYNCABLE_PREF);
340 prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar, 343 prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar,
341 true, 344 true,
342 PrefService::UNSYNCABLE_PREF); 345 PrefService::UNSYNCABLE_PREF);
343 } 346 }
OLDNEW
« no previous file with comments | « chrome/browser/plugin_prefs.cc ('k') | chrome/common/chrome_content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698