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

Unified Diff: chrome/common/chrome_content_client.cc

Issue 10035024: DCHECK earlier if pepper flash is missing even though FLAPPER_AVAILABLE is defined. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment instead of logging 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 331b55144d24ddb1dcb23398b986e25ad5603e94..3c487c2ce80536703ed6f478043e2244a4af5f7e 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -232,6 +232,10 @@ void AddPepperFlash(std::vector<content::PepperPluginInfo>* plugins) {
#if defined(FLAPPER_AVAILABLE)
if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &plugin.path))
return;
+ // It is an error to have FLAPPER_AVAILABLE defined but then not having the
+ // plugin file in place, but this happens in Chrome OS builds.
+ // Use --disable-bundled-ppapi-flash to skip this.
+ DCHECK(file_util::PathExists(plugin.path));
flash_version = FLAPPER_VERSION_STRING;
#else
LOG(ERROR) << "PPAPI Flash not included at build time.";
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698