chrome/common/pepper_flash.cc - Issue 1030803002: Restore the architecture check for Pepper plugins.

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/common/pepper_flash.cc

Issue 1030803002: Restore the architecture check for Pepper plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 9 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

OLD	NEW
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 "base/strings/string_split.h"	5 #include "base/strings/string_split.h"

6 #include "base/values.h"	6 #include "base/values.h"

7 #include "base/version.h"	7 #include "base/version.h"

8 #include "chrome/common/pepper_flash.h"	8 #include "chrome/common/pepper_flash.h"

9 #include "chrome/common/ppapi_utils.h"	9 #include "chrome/common/ppapi_utils.h"

10 #include "ppapi/c/private/ppb_pdf.h"	10 #include "ppapi/c/private/ppb_pdf.h"

(...skipping 99 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
110 if (name == "WinFlapper") {	110 if (name == "WinFlapper") {

111 *version_out = version;	111 *version_out = version;

112 return true;	112 return true;

113 }	113 }

114	114

115 std::string os;	115 std::string os;

116 manifest.GetStringASCII("x-ppapi-os", &os);	116 manifest.GetStringASCII("x-ppapi-os", &os);

117 if (os != kPepperFlashOperatingSystem)	117 if (os != kPepperFlashOperatingSystem)

118 return false;	118 return false;

119	119

120 // On Win64, PepperFlash manifests have "ia32" instead of "x64" so skip the

121 // architecture check. TODO(wfh): remove this when crbug.com/458894 is fixed.

122 #if !defined(OS_WIN) \|\| !defined(ARCH_CPU_X86_64)

123 std::string arch;	120 std::string arch;

124 manifest.GetStringASCII("x-ppapi-arch", &arch);	121 manifest.GetStringASCII("x-ppapi-arch", &arch);

125 if (arch != kPepperFlashArch)	122 if (arch != kPepperFlashArch)

126 return false;	123 return false;

127 #endif

128	124

129 *version_out = version;	125 *version_out = version;

130 return true;	126 return true;

131 }	127 }

132	128

133 } // namespace chrome	129 } // namespace chrome

OLD	NEW

« no previous file with comments | « no previous file | chrome/test/data/components/flapper/windows_x64/manifest.json » ('j') | no next file with comments »