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

Issue 11141011: Merge 161210 - Only register the newer one of {bundled, component} Pepper Flash. (Closed)

Created:
8 years, 2 months ago by Bernhard Bauer
Modified:
8 years, 2 months ago
Reviewers:
yzshen1
CC:
chromium-reviews, joi+watch-content_chromium.org, darin-cc_chromium.org, jam
Visibility:
Public.

Description

Merge 161210 - Only register the newer one of {bundled, component} Pepper Flash. We look at the file name to identify Pepper Flash now, so it shouldn't break the compile on the branch. TBR=bauerb@chromium.org BUG=151716 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=161763

Patch Set 1 #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+36 lines, -0 lines) Patch
M chrome/browser/component_updater/pepper_flash_component_installer.cc View 2 chunks +27 lines, -0 lines 2 comments Download
M content/browser/plugin_service_impl.h View 1 chunk +2 lines, -0 lines 0 comments Download
M content/browser/plugin_service_impl.cc View 1 chunk +5 lines, -0 lines 0 comments Download
M content/public/browser/plugin_service.h View 1 chunk +2 lines, -0 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
yzshen1
https://codereview.chromium.org/11141011/diff/1/chrome/browser/component_updater/pepper_flash_component_installer.cc File chrome/browser/component_updater/pepper_flash_component_installer.cc (right): https://codereview.chromium.org/11141011/diff/1/chrome/browser/component_updater/pepper_flash_component_installer.cc#newcode169 chrome/browser/component_updater/pepper_flash_component_installer.cc:169: bool IsPepperFlash(const webkit::WebPluginInfo& plugin) { nit, optional: It would ...
8 years, 2 months ago (2012-10-13 16:33:35 UTC) #1
yzshen1
LGTM
8 years, 2 months ago (2012-10-13 16:34:17 UTC) #2
yzshen1
LGTM
8 years, 2 months ago (2012-10-13 16:34:17 UTC) #3
Bernhard Bauer
8 years, 2 months ago (2012-10-13 16:43:44 UTC) #4
https://codereview.chromium.org/11141011/diff/1/chrome/browser/component_upda...
File chrome/browser/component_updater/pepper_flash_component_installer.cc
(right):

https://codereview.chromium.org/11141011/diff/1/chrome/browser/component_upda...
chrome/browser/component_updater/pepper_flash_component_installer.cc:169: bool
IsPepperFlash(const webkit::WebPluginInfo& plugin) {
On 2012/10/13 16:33:35, yzshen1 wrote:
> nit, optional: It would be more consistent with plugin_prefs to check the full
> path to be sure that it is the bundled flapper
> (chrome::FILE_PEPPER_FLASH_PLUGIN).
> But I don't think it is a big deal.

Yeah, I decided not to do the full path check because what we really want here
is to load at most one Pepper Flash, regardless of where it comes from. That's
also why I'm simply using PERMISSION_FLASH on trunk.

Powered by Google App Engine
This is Rietveld 408576698