chrome/browser/plugin_prefs.cc - Issue 7618013: Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/plugin_prefs.cc

Issue 7618013: Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/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_prefs.h ('k') | chrome/browser/plugin_updater.h » ('j') | no next file with comments »

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

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 413 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
424 prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,	424 prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,

425 internal_dir,	425 internal_dir,

426 PrefService::UNSYNCABLE_PREF);	426 PrefService::UNSYNCABLE_PREF);

427 prefs->RegisterListPref(prefs::kPluginsDisabledPlugins,	427 prefs->RegisterListPref(prefs::kPluginsDisabledPlugins,

428 PrefService::UNSYNCABLE_PREF);	428 PrefService::UNSYNCABLE_PREF);

429 prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,	429 prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,

430 PrefService::UNSYNCABLE_PREF);	430 PrefService::UNSYNCABLE_PREF);

431 prefs->RegisterListPref(prefs::kPluginsEnabledPlugins,	431 prefs->RegisterListPref(prefs::kPluginsEnabledPlugins,

432 PrefService::UNSYNCABLE_PREF);	432 PrefService::UNSYNCABLE_PREF);

433 }	433 }

OLD	NEW