diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-28 00:22:49 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-28 00:22:49 +0000 |
| commit | 2af3e370192e72abab6db1fd8e2febc36bf22934 (patch) | |
| tree | a198d570c601cc7d1117b20919ff247b3095109b /chrome/common/chrome_paths.h | |
| parent | 6b4c1d4d39f37b8356fe6158866dc10004ccdc3b (diff) | |
| download | chromium_src-2af3e370192e72abab6db1fd8e2febc36bf22934.zip chromium_src-2af3e370192e72abab6db1fd8e2febc36bf22934.tar.gz chromium_src-2af3e370192e72abab6db1fd8e2febc36bf22934.tar.bz2 | |
Revert r196939 "Add Widevine CDM component installer."
> Add Widevine CDM component installer.
>
> This CL adds a component installer for Widevine CDM on Windows and Mac. Note that it uses a fake extension ID which will be replaced when we have the real one. Also the component is not registered in chrome_browser_main.cc yet. We need to have the real CDMs uploaded to the server to fully test and enable this feature.
>
> BUG=180260
> TEST=Tested local operations (registering plugin, remove old versions, etc) on Linux without sandbox. Will need to test against the server later
Reason: Broke chrome linux build
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux/builds/29780
LINK(target) out/Release/test_shell: Finished
LINK(target) out/Release/content_unittests: Finished
out/Release/obj.target/chrome/../common_constants/chrome/common/chrome_paths.o: In function `.L43':
/b/build/slave/google-chrome-rel-linux/build/src/chrome/common/chrome_paths.cc:363: undefined reference to `kWidevineCdmBaseDirectory'
collect2: ld returned 1 exit status
make: *** [out/Release/remoting_unittests] Error 1
LINK(target) out/Release/content_shell: Finished
TOUCH out/Release/obj.target/content/content_shell_builder.stamp
TBR=xhwang@chromium.org
BUG=180260
Review URL: https://codereview.chromium.org/14417012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.h')
| -rw-r--r-- | chrome/common/chrome_paths.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index c5dc2a5..93912b2 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -90,12 +90,11 @@ enum { FILE_O3D_PLUGIN, // Full path to the O3D Pepper plugin file. FILE_O1D_PLUGIN, // Full path to the O1D Pepper plugin file. FILE_GTALK_PLUGIN, // Full path to the GTalk Pepper plugin file. - DIR_WIDEVINE_CDM, // Directory that contains Widevine CDM files. FILE_WIDEVINE_CDM_PLUGIN, // Full path to the Widevine CDM Pepper plugin // file. FILE_RESOURCES_PACK, // Full path to the .pak file containing // binary data (e.g., html files and images - // used by internal pages). + // used by interal pages). DIR_RESOURCES_EXTENSION, // Full path to extension resources. #if defined(OS_CHROMEOS) DIR_CHROMEOS_WALLPAPERS, // Directory where downloaded chromeos |