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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 10281007: Fix the issue that Pepper Flash cannot load on Linux. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/chrome_content_client.h » ('j') | chrome/common/pepper_flash.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 870982e0b23d9d7175f71fea2d81e07d2be09b12..bec79ae151faadf11145ba8a8f269fd8bb1032b3 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -766,7 +766,8 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
bool add_at_beginning = false;
chrome::ChromeContentClient* content_client =
static_cast<chrome::ChromeContentClient*>(content::GetContentClient());
- if (content_client->GetBundledPepperFlash(&plugin, &add_at_beginning)) {
+ if (content_client->GetBundledFieldTrialPepperFlash(&plugin,
+ &add_at_beginning)) {
plugin_service->RegisterInternalPlugin(plugin.ToWebPluginInfo(),
add_at_beginning);
}
« no previous file with comments | « no previous file | chrome/common/chrome_content_client.h » ('j') | chrome/common/pepper_flash.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698