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

Side by Side Diff: content/renderer/pepper/content_decryptor_delegate.cc

Issue 2373523003: Clean up sparse_histogram.h header (Closed)
Patch Set: Rebase update on Oct 18 Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « content/common/sandbox_win.cc ('k') | device/bluetooth/bluetooth_device_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/pepper/content_decryptor_delegate.h" 5 #include "content/renderer/pepper/content_decryptor_delegate.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback_helpers.h" 11 #include "base/callback_helpers.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/metrics/sparse_histogram.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/numerics/safe_conversions.h" 14 #include "base/numerics/safe_conversions.h"
15 #include "base/trace_event/trace_event.h" 15 #include "base/trace_event/trace_event.h"
16 #include "content/renderer/pepper/ppb_buffer_impl.h" 16 #include "content/renderer/pepper/ppb_buffer_impl.h"
17 #include "media/base/audio_buffer.h" 17 #include "media/base/audio_buffer.h"
18 #include "media/base/audio_decoder_config.h" 18 #include "media/base/audio_decoder_config.h"
19 #include "media/base/bind_to_current_loop.h" 19 #include "media/base/bind_to_current_loop.h"
20 #include "media/base/cdm_key_information.h" 20 #include "media/base/cdm_key_information.h"
21 #include "media/base/channel_layout.h" 21 #include "media/base/channel_layout.h"
22 #include "media/base/data_buffer.h" 22 #include "media/base/data_buffer.h"
23 #include "media/base/decoder_buffer.h" 23 #include "media/base/decoder_buffer.h"
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1254 empty_frames); 1254 empty_frames);
1255 } 1255 }
1256 1256
1257 if (!video_decode_cb_.is_null()) 1257 if (!video_decode_cb_.is_null())
1258 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL); 1258 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);
1259 1259
1260 cdm_promise_adapter_.Clear(); 1260 cdm_promise_adapter_.Clear();
1261 } 1261 }
1262 1262
1263 } // namespace content 1263 } // namespace content
OLDNEW
« no previous file with comments | « content/common/sandbox_win.cc ('k') | device/bluetooth/bluetooth_device_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698