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

Side by Side Diff: content/renderer/media/android/proxy_media_keys.h

Issue 297703002: Using GURL in place of std::string for destination_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 6 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
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 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "media/base/media_keys.h" 9 #include "media/base/media_keys.h"
10 10
(...skipping 30 matching lines...) Expand all
41 const std::string& web_session_id) OVERRIDE; 41 const std::string& web_session_id) OVERRIDE;
42 virtual void UpdateSession(uint32 session_id, 42 virtual void UpdateSession(uint32 session_id,
43 const uint8* response, 43 const uint8* response,
44 int response_length) OVERRIDE; 44 int response_length) OVERRIDE;
45 virtual void ReleaseSession(uint32 session_id) OVERRIDE; 45 virtual void ReleaseSession(uint32 session_id) OVERRIDE;
46 46
47 // Callbacks. 47 // Callbacks.
48 void OnSessionCreated(uint32 session_id, const std::string& web_session_id); 48 void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
49 void OnSessionMessage(uint32 session_id, 49 void OnSessionMessage(uint32 session_id,
50 const std::vector<uint8>& message, 50 const std::vector<uint8>& message,
51 const std::string& destination_url); 51 const GURL& destination_url);
52 void OnSessionReady(uint32 session_id); 52 void OnSessionReady(uint32 session_id);
53 void OnSessionClosed(uint32 session_id); 53 void OnSessionClosed(uint32 session_id);
54 void OnSessionError(uint32 session_id, 54 void OnSessionError(uint32 session_id,
55 media::MediaKeys::KeyError error_code, 55 media::MediaKeys::KeyError error_code,
56 uint32 system_code); 56 uint32 system_code);
57 57
58 int GetCdmId() const; 58 int GetCdmId() const;
59 59
60 private: 60 private:
61 ProxyMediaKeys(RendererMediaPlayerManager* manager, 61 ProxyMediaKeys(RendererMediaPlayerManager* manager,
(...skipping 17 matching lines...) Expand all
79 media::SessionReadyCB session_ready_cb_; 79 media::SessionReadyCB session_ready_cb_;
80 media::SessionClosedCB session_closed_cb_; 80 media::SessionClosedCB session_closed_cb_;
81 media::SessionErrorCB session_error_cb_; 81 media::SessionErrorCB session_error_cb_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys); 83 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys);
84 }; 84 };
85 85
86 } // namespace content 86 } // namespace content
87 87
88 #endif // CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_ 88 #endif // CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
OLDNEW
« no previous file with comments | « content/browser/media/android/browser_media_player_manager.cc ('k') | content/renderer/media/android/proxy_media_keys.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698