mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 134.0.6998.0 (#1415337)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/common/media/component_widevine_cdm_hint_file_linux.cc chrome/common/media/component_widevine_cdm_hint_file_linux.cc
|
||||
index b3e05e8183158..90be2d4a3368b 100644
|
||||
index c416845d817fe..f940dd80e2ed4 100644
|
||||
--- chrome/common/media/component_widevine_cdm_hint_file_linux.cc
|
||||
+++ chrome/common/media/component_widevine_cdm_hint_file_linux.cc
|
||||
@@ -18,6 +18,7 @@
|
||||
@@ -8,9 +8,9 @@ index b3e05e8183158..90be2d4a3368b 100644
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
+#include "third_party/widevine/cdm/widevine_cdm_common.h"
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
#include "base/command_line.h"
|
||||
@@ -32,6 +33,26 @@ namespace {
|
||||
namespace {
|
||||
|
||||
@@ -25,6 +26,26 @@ namespace {
|
||||
const char kPath[] = "Path";
|
||||
const char kLastBundledVersion[] = "LastBundledVersion";
|
||||
|
||||
@@ -37,19 +37,9 @@ index b3e05e8183158..90be2d4a3368b 100644
|
||||
// Returns the hint file contents as a Value::Dict. Returned result may be an
|
||||
// empty dictionary if the hint file does not exist or is formatted incorrectly.
|
||||
base::Value::Dict GetHintFileContents() {
|
||||
@@ -58,8 +79,7 @@ base::Value::Dict GetHintFileContents() {
|
||||
hint_file_path = command_line->GetSwitchValuePath(
|
||||
switches::kCrosWidevineComponentUpdatedHintFile);
|
||||
#else
|
||||
- CHECK(base::PathService::Get(chrome::FILE_COMPONENT_WIDEVINE_CDM_HINT,
|
||||
- &hint_file_path));
|
||||
+ CHECK(GetHintFilePath(&hint_file_path));
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
@@ -65,8 +86,7 @@ bool UpdateWidevineCdmHintFile(const base::FilePath& cdm_base_path,
|
||||
DCHECK(!cdm_base_path.empty());
|
||||
|
||||
DVLOG(1) << __func__ << " checking " << hint_file_path;
|
||||
@@ -98,8 +118,7 @@ bool UpdateWidevineCdmHintFile(const base::FilePath& cdm_base_path,
|
||||
NOTREACHED() << "Lacros should not be updating the hint file.";
|
||||
#else
|
||||
base::FilePath hint_file_path;
|
||||
- CHECK(base::PathService::Get(chrome::FILE_COMPONENT_WIDEVINE_CDM_HINT,
|
||||
- &hint_file_path));
|
||||
|
Reference in New Issue
Block a user