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

Unified Diff: extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc

Issue 2508153002: [chrome.displaySource] Switch mojom targets to use STL types. (Closed)
Patch Set: OWNERS Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/renderer/api/display_source/wifi_display/wifi_display_session.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc
diff --git a/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc b/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc
index e939263348b6d0f1237c1bca15a0bf6537e3383f..709afee6c0323d80143a559b9c49ded8825cd13f 100644
--- a/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc
+++ b/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc
@@ -74,8 +74,8 @@ void WiFiDisplaySession::Terminate(const CompletionCallback& callback) {
teminate_completion_callback_ = callback;
}
-void WiFiDisplaySession::OnConnected(const mojo::String& local_ip_address,
- const mojo::String& sink_ip_address) {
+void WiFiDisplaySession::OnConnected(const std::string& local_ip_address,
+ const std::string& sink_ip_address) {
DCHECK_EQ(DisplaySourceSession::Established, state_);
local_ip_address_ = local_ip_address;
media_manager_.reset(
@@ -92,7 +92,7 @@ void WiFiDisplaySession::OnConnected(const mojo::String& local_ip_address,
}
void WiFiDisplaySession::OnConnectRequestHandled(bool success,
- const mojo::String& error) {
+ const std::string& error) {
DCHECK_EQ(DisplaySourceSession::Establishing, state_);
state_ =
success ? DisplaySourceSession::Established : DisplaySourceSession::Idle;
@@ -108,19 +108,18 @@ void WiFiDisplaySession::OnTerminated() {
}
void WiFiDisplaySession::OnDisconnectRequestHandled(bool success,
- const mojo::String& error) {
+ const std::string& error) {
RunTerminateCallback(success, error);
}
-void WiFiDisplaySession::OnError(int32_t type,
- const mojo::String& description) {
+void WiFiDisplaySession::OnError(int32_t type, const std::string& description) {
DCHECK(type > api::display_source::ERROR_TYPE_NONE
&& type <= api::display_source::ERROR_TYPE_LAST);
DCHECK_EQ(DisplaySourceSession::Established, state_);
error_callback_.Run(static_cast<ErrorType>(type), description);
}
-void WiFiDisplaySession::OnMessage(const mojo::String& data) {
+void WiFiDisplaySession::OnMessage(const std::string& data) {
DCHECK_EQ(DisplaySourceSession::Established, state_);
DCHECK(wfd_source_);
wfd_source_->RTSPDataReceived(data);
« no previous file with comments | « extensions/renderer/api/display_source/wifi_display/wifi_display_session.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698