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

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

Issue 7720021: Add a preference to force enable the NaCl plugin as we transition to (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/
Patch Set: Created 9 years, 4 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_updater.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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 LoadDataResourceBytes(IDR_PLUGIN); 320 LoadDataResourceBytes(IDR_PLUGIN);
321 } 321 }
322 322
323 // static 323 // static
324 void PluginsUI::RegisterUserPrefs(PrefService* prefs) { 324 void PluginsUI::RegisterUserPrefs(PrefService* prefs) {
325 prefs->RegisterListPref(prefs::kPluginsPluginsList, 325 prefs->RegisterListPref(prefs::kPluginsPluginsList,
326 PrefService::UNSYNCABLE_PREF); 326 PrefService::UNSYNCABLE_PREF);
327 prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF, 327 prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF,
328 false, 328 false,
329 PrefService::UNSYNCABLE_PREF); 329 PrefService::UNSYNCABLE_PREF);
330 prefs->RegisterBooleanPref(prefs::kPluginsEnabledNaCl,
331 false,
332 PrefService::UNSYNCABLE_PREF);
330 prefs->RegisterBooleanPref(prefs::kPluginsShowDetails, 333 prefs->RegisterBooleanPref(prefs::kPluginsShowDetails,
331 false, 334 false,
332 PrefService::UNSYNCABLE_PREF); 335 PrefService::UNSYNCABLE_PREF);
333 prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar, 336 prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar,
334 true, 337 true,
335 PrefService::UNSYNCABLE_PREF); 338 PrefService::UNSYNCABLE_PREF);
336 } 339 }
OLDNEW
« no previous file with comments | « chrome/browser/plugin_updater.cc ('k') | chrome/common/chrome_content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698