chrome/browser/chromeos/plugin_selection_policy.cc - Issue 3796011: Merge 62261, 62267, 62265 & 62679...

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/chromeos/plugin_selection_policy.cc

Issue 3796011: Merge 62261, 62267, 62265 & 62679... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552/src/

Patch Set: Created 10 years, 2 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:

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/chromeos/plugin_selection_policy.h"	5 #include "chrome/browser/chromeos/plugin_selection_policy.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <iostream>	8 #include <iostream>

9 #include <map>	9 #include <map>

10 #include <sstream>	10 #include <sstream>

(...skipping 146 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
157 }	157 }

158 return allow;	158 return allow;

159 }	159 }

160	160

161 // If it's not in the policy file, then we assume it's OK to allow	161 // If it's not in the policy file, then we assume it's OK to allow

162 // it.	162 // it.

163 return true;	163 return true;

164 }	164 }

165	165

166 } // namespace chromeos	166 } // namespace chromeos

OLD	NEW