← Back to branch summary

~saiarcot895/chromium-browser/chromium-browser.vivid.beta

« back to all changes in this revision

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

  • Committer: Saikrishna Arcot
  • Date: 2015-07-09 23:11:58 UTC
  • Revision ID: saiarcot895@gmail.com-20150709231158-9j8jw1drmc55afp7
Tags: 44.0.2403.81-0ubuntu1~ppa1~vivid1
* New upstream version 44.0.2403.81
* Refreshed and updated patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/widevine-other-locations
 
1
Index: beta.wily/chrome/common/chrome_paths.cc
 
2
===================================================================
 
3
--- beta.wily.orig/chrome/common/chrome_paths.cc        2015-07-09 18:04:46.569046175 -0400
 
4
+++ beta.wily/chrome/common/chrome_paths.cc     2015-07-09 18:04:46.567046203 -0400
 
5
@@ -356,6 +356,14 @@
 
6
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
 
7
 #if defined(WIDEVINE_CDM_IS_COMPONENT)
 
8
     case chrome::DIR_COMPONENT_WIDEVINE_CDM:
 
9
+      if (base::PathExists(base::FilePath("/opt/google/chrome-unstable/libwidevinecdm.so"))) {
 
10
+        cur = cur.Append("/opt/google/chrome-unstable/");
 
11
+        break;
 
12
+      }
 
13
+      if (base::PathExists(base::FilePath("/opt/google/chrome/libwidevinecdm.so"))) {
 
14
+        cur = cur.Append("/opt/google/chrome/");
 
15
+        break;
 
16
+      }
 
17
       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
 
18
         return false;
 
19
       cur = cur.Append(kWidevineCdmBaseDirectory);
 
20
@@ -365,6 +373,14 @@
 
21
     // In the component case, this is the source adapter. Otherwise, it is the
 
22
     // actual Pepper module that gets loaded.
 
23
     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
 
24
+      if (base::PathExists(base::FilePath("/opt/google/chrome-unstable/libwidevinecdmadapter.so"))) {
 
25
+        cur = cur.AppendASCII("/opt/google/chrome-unstable/libwidevinecdmadapter.so");
 
26
+        break;
 
27
+      }
 
28
+      if (base::PathExists(base::FilePath("/opt/google/chrome/libwidevinecdmadapter.so"))) {
 
29
+        cur = cur.AppendASCII("/opt/google/chrome/libwidevinecdmadapter.so");
 
30
+        break;
 
31
+      }
 
32
       if (!GetInternalPluginsDirectory(&cur))
 
33
         return false;
 
34
       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);