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

Unified Diff: media/cdm/cdm_paths.cc

Issue 2001953002: Revert of media: Use platform specific folders for CDMs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « media/cdm/cdm_paths.h ('k') | media/cdm/external_clear_key_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/cdm_paths.cc
diff --git a/media/cdm/cdm_paths.cc b/media/cdm/cdm_paths.cc
deleted file mode 100644
index b1886f9ea45e5576c575ae572f30185f018d6a24..0000000000000000000000000000000000000000
--- a/media/cdm/cdm_paths.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "media/cdm/cdm_paths.h"
-
-#include <string>
-
-#include "build/build_config.h"
-
-namespace media {
-
-// Note: This file must be in sync with cdm_paths.{gypi|gni}
-// TODO(xhwang): Improve how we enable platform specific path. See
-// http://crbug.com/468584
-#if defined(OS_MACOSX) || defined(OS_WIN)
-#define CDM_USE_PLATFORM_SPECIFIC_PATH
-#endif
-
-#if defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
-
-// Special path used in chrome components.
-const char kPlatformSpecific[] = "_platform_specific";
-
-// Name of the component platform in the manifest.
-const char kComponentPlatform[] =
-#if defined(OS_MACOSX)
- "mac";
-#elif defined(OS_WIN)
- "win";
-#elif defined(OS_CHROMEOS)
- "chromeos";
-#elif defined(OS_LINUX)
- "linux";
-#else
- "unsupported_platform";
-#endif
-
-// Name of the component architecture in the manifest.
-const char kComponentArch[] =
-#if defined(ARCH_CPU_X86)
- "x86";
-#elif defined(ARCH_CPU_X86_64)
- "x64";
-#elif defined(ARCH_CPU_ARMEL)
- "arm";
-#else
- "unsupported_arch";
-#endif
-
-base::FilePath GetPlatformSpecificDirectory(const std::string& cdm_base_path) {
- base::FilePath path;
- const std::string kPlatformArch =
- std::string(kComponentPlatform) + "_" + kComponentArch;
- return path.AppendASCII(cdm_base_path)
- .AppendASCII(kPlatformSpecific)
- .AppendASCII(kPlatformArch);
-}
-
-#else // defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
-
-base::FilePath GetPlatformSpecificDirectory(const std::string& cdm_base_path) {
- return base::FilePath();
-}
-
-#endif // defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
-
-} // namespace media
« no previous file with comments | « media/cdm/cdm_paths.h ('k') | media/cdm/external_clear_key_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698