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

Side by Side Diff: content/common/media/media_player_messages_android.h

Issue 18868005: content: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
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 // IPC messages for android media player. 5 // IPC messages for android media player.
6 // Multiply-included message file, hence no include guard. 6 // Multiply-included message file, hence no include guard.
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
14 #include "googleurl/src/gurl.h"
15 #include "ipc/ipc_message_macros.h" 14 #include "ipc/ipc_message_macros.h"
16 #include "media/base/android/media_player_android.h" 15 #include "media/base/android/media_player_android.h"
17 #include "media/base/media_keys.h" 16 #include "media/base/media_keys.h"
18 #include "ui/gfx/rect_f.h" 17 #include "ui/gfx/rect_f.h"
18 #include "url/gurl.h"
19 19
20 #undef IPC_MESSAGE_EXPORT 20 #undef IPC_MESSAGE_EXPORT
21 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT 21 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
22 #define IPC_MESSAGE_START MediaPlayerMsgStart 22 #define IPC_MESSAGE_START MediaPlayerMsgStart
23 23
24 #include "media/base/android/demuxer_stream_player_params.h" 24 #include "media/base/android/demuxer_stream_player_params.h"
25 25
26 IPC_ENUM_TRAITS(media::AudioCodec) 26 IPC_ENUM_TRAITS(media::AudioCodec)
27 IPC_ENUM_TRAITS(media::DemuxerStream::Status) 27 IPC_ENUM_TRAITS(media::DemuxerStream::Status)
28 IPC_ENUM_TRAITS(media::DemuxerStream::Type) 28 IPC_ENUM_TRAITS(media::DemuxerStream::Type)
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 int /* media_keys_id */, 244 int /* media_keys_id */,
245 std::string /* session_id */, 245 std::string /* session_id */,
246 media::MediaKeys::KeyError /* error_code */, 246 media::MediaKeys::KeyError /* error_code */,
247 int /* system_code */) 247 int /* system_code */)
248 248
249 IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage, 249 IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage,
250 int /* media_keys_id */, 250 int /* media_keys_id */,
251 std::string /* session_id */, 251 std::string /* session_id */,
252 std::vector<uint8> /* message */, 252 std::vector<uint8> /* message */,
253 std::string /* destination_url */) 253 std::string /* destination_url */)
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.h ('k') | content/common/media/media_stream_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698