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

Side by Side Diff: media/blink/encrypted_media_player_support.cc

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « media/blink/cdm_session_adapter.cc ('k') | media/blink/test_response_generator.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 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 "media/blink/encrypted_media_player_support.h" 5 #include "media/blink/encrypted_media_player_support.h"
6 6
7 #include <string>
8 7
9 #include "base/bind.h" 8 #include "base/bind.h"
10 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
11 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
12 #include "base/numerics/safe_conversions.h" 11 #include "base/numerics/safe_conversions.h"
13 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
16 #include "media/base/bind_to_current_loop.h" 15 #include "media/base/bind_to_current_loop.h"
17 #include "media/base/key_systems.h" 16 #include "media/base/key_systems.h"
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 315
317 client_->keyMessage( 316 client_->keyMessage(
318 WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)), 317 WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
319 WebString::fromUTF8(session_id), 318 WebString::fromUTF8(session_id),
320 message.empty() ? NULL : &message[0], 319 message.empty() ? NULL : &message[0],
321 base::saturated_cast<unsigned int>(message.size()), 320 base::saturated_cast<unsigned int>(message.size()),
322 destination_url); 321 destination_url);
323 } 322 }
324 323
325 } // namespace media 324 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/cdm_session_adapter.cc ('k') | media/blink/test_response_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698