media/blink/key_system_config_selector.cc - Issue 1542013004: Switch to standard integer types in media/, take 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/blink/key_system_config_selector.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 4 years, 12 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

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "key_system_config_selector.h"	5 #include "key_system_config_selector.h"

6	6

	7 #include <stddef.h>

	8

7 #include "base/bind.h"	9 #include "base/bind.h"

8 #include "base/logging.h"	10 #include "base/logging.h"

9 #include "base/strings/string_util.h"	11 #include "base/strings/string_util.h"

10 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

11 #include "media/base/cdm_config.h"	13 #include "media/base/cdm_config.h"

12 #include "media/base/key_systems.h"	14 #include "media/base/key_systems.h"

13 #include "media/base/media_permission.h"	15 #include "media/base/media_permission.h"

14 #include "media/base/mime_util.h"	16 #include "media/base/mime_util.h"

15 #include "media/blink/webmediaplayer_util.h"	17 #include "media/blink/webmediaplayer_util.h"

16 #include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"	18 #include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"

(...skipping 756 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
773	775

774 void KeySystemConfigSelector::OnPermissionResult(	776 void KeySystemConfigSelector::OnPermissionResult(

775 scoped_ptr<SelectionRequest> request,	777 scoped_ptr<SelectionRequest> request,

776 bool is_permission_granted) {	778 bool is_permission_granted) {

777 request->was_permission_requested = true;	779 request->was_permission_requested = true;

778 request->is_permission_granted = is_permission_granted;	780 request->is_permission_granted = is_permission_granted;

779 SelectConfigInternal(request.Pass());	781 SelectConfigInternal(request.Pass());

780 }	782 }

781	783

782 } // namespace media	784 } // namespace media

OLD	NEW

« no previous file with comments | « media/blink/encrypted_media_player_support.cc ('k') | media/blink/key_system_config_selector_unittest.cc » ('j') | no next file with comments »