← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/widevine-other-locations

  • Committer: Chad MILLER
  • Date: 2015-06-29 20:03:01 UTC
  • Revision ID: chad.miller@canonical.com-20150629200301-fei5ciczq7gq2up5
* debian/patches/widevine-other-locations: Search Chrome install 
  location to find widevine plugins.
* Reenable GPU usage on Wily only. Silent disabling is probably a 
  bad idea.
* Use new Flash plugin name in apport collector.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/widevine-other-locations
 
1
--- a/chrome/common/chrome_paths.cc
 
2
+++ b/chrome/common/chrome_paths.cc
 
3
@@ -392,6 +392,10 @@ bool PathProvider(int key, base::FilePat
 
4
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
 
5
 #if defined(WIDEVINE_CDM_IS_COMPONENT)
 
6
     case chrome::DIR_COMPONENT_WIDEVINE_CDM:
 
7
+      if (base::PathExists("/opt/google/chrome/libwidevinecdm.so")) {
 
8
+        cur = cur.Append("/opt/google/chrome/");
 
9
+        break;
 
10
+      }
 
11
       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
 
12
         return false;
 
13
       cur = cur.Append(kWidevineCdmBaseDirectory);
 
14
@@ -401,6 +405,10 @@ bool PathProvider(int key, base::FilePat
 
15
     // In the component case, this is the source adapter. Otherwise, it is the
 
16
     // actual Pepper module that gets loaded.
 
17
     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
 
18
+      if (base::PathExists("/opt/google/chrome/libwidevinecdmadapter.so")) {
 
19
+        cur = cur.AppendASCII("/opt/google/chrome/libwidevinecdmadapter.so");
 
20
+        break;
 
21
+      }
 
22
       if (!GetInternalPluginsDirectory(&cur))
 
23
         return false;
 
24
       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);