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

Side by Side Diff: media/cdm/proxy_decryptor.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 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
« no previous file with comments | « media/cdm/proxy_decryptor.h ('k') | media/cdm/stub/stub_cdm.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "media/cdm/proxy_decryptor.h" 5 #include "media/cdm/proxy_decryptor.h"
6 6
7 #include <stddef.h>
8
7 #include <cstring> 9 #include <cstring>
8 10
9 #include "base/bind.h" 11 #include "base/bind.h"
10 #include "base/callback_helpers.h" 12 #include "base/callback_helpers.h"
11 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h"
12 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "build/build_config.h"
13 #include "media/base/cdm_callback_promise.h" 17 #include "media/base/cdm_callback_promise.h"
14 #include "media/base/cdm_config.h" 18 #include "media/base/cdm_config.h"
15 #include "media/base/cdm_factory.h" 19 #include "media/base/cdm_factory.h"
16 #include "media/base/cdm_key_information.h" 20 #include "media/base/cdm_key_information.h"
17 #include "media/base/key_systems.h" 21 #include "media/base/key_systems.h"
18 #include "media/base/media_permission.h" 22 #include "media/base/media_permission.h"
19 #include "media/cdm/json_web_key.h" 23 #include "media/cdm/json_web_key.h"
20 #include "media/cdm/key_system_names.h" 24 #include "media/cdm/key_system_names.h"
21 25
22 namespace media { 26 namespace media {
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 bool is_persistent = 406 bool is_persistent =
403 session_type == PersistentSession || session_type == LoadSession; 407 session_type == PersistentSession || session_type == LoadSession;
404 active_sessions_.insert(std::make_pair(session_id, is_persistent)); 408 active_sessions_.insert(std::make_pair(session_id, is_persistent));
405 409
406 // For LoadSession(), generate the KeyAdded event. 410 // For LoadSession(), generate the KeyAdded event.
407 if (session_type == LoadSession) 411 if (session_type == LoadSession)
408 GenerateKeyAdded(session_id); 412 GenerateKeyAdded(session_id);
409 } 413 }
410 414
411 } // namespace media 415 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/proxy_decryptor.h ('k') | media/cdm/stub/stub_cdm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698