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

Side by Side Diff: chrome/renderer/plugins/plugin_uma.cc

Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix #endif Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/plugins/plugin_uma.h" 5 #include "chrome/renderer/plugins/plugin_uma.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstring> 8 #include <cstring>
9 9
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 return QUICKTIME; 171 return QUICKTIME;
172 172
173 if (mime_type == content::kBrowserPluginMimeType) 173 if (mime_type == content::kBrowserPluginMimeType)
174 return BROWSER_PLUGIN; 174 return BROWSER_PLUGIN;
175 175
176 if (mime_type == content::kFlashPluginSwfMimeType || 176 if (mime_type == content::kFlashPluginSwfMimeType ||
177 mime_type == content::kFlashPluginSplMimeType) { 177 mime_type == content::kFlashPluginSplMimeType) {
178 return SHOCKWAVE_FLASH; 178 return SHOCKWAVE_FLASH;
179 } 179 }
180 180
181 #if defined(ENABLE_PEPPER_CDMS) 181 #if defined(ENABLE_PEPPER_CDMS) && defined(ENABLE_WIDEVINE_CDM)
182 if (mime_type == kWidevineCdmPluginMimeType) 182 if (mime_type == kWidevineCdmPluginMimeType)
183 return WIDEVINE_CDM; 183 return WIDEVINE_CDM;
184 #endif 184 #endif
185 185
186 return UNSUPPORTED_MIMETYPE; 186 return UNSUPPORTED_MIMETYPE;
187 } 187 }
OLDNEW
« no previous file with comments | « chrome/renderer/pepper/pepper_uma_host.cc ('k') | chrome/renderer/plugins/plugin_uma_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698