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

Side by Side Diff: chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc

Issue 2932933002: [Media Router] Increment the media's current_time in the WebUI route controller (Closed)
Patch Set: Check that we can increment in onRouteStatusChange_() Created 3 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/ui/webui/media_router/media_router_webui_message_handle r.h" 5 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handle r.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 const MediaStatus& status) { 335 const MediaStatus& status) {
336 current_media_status_ = base::make_optional<MediaStatus>(MediaStatus(status)); 336 current_media_status_ = base::make_optional<MediaStatus>(MediaStatus(status));
337 337
338 base::DictionaryValue status_value; 338 base::DictionaryValue status_value;
339 status_value.SetString("title", status.title); 339 status_value.SetString("title", status.title);
340 status_value.SetString("description", status.description); 340 status_value.SetString("description", status.description);
341 status_value.SetBoolean("canPlayPause", status.can_play_pause); 341 status_value.SetBoolean("canPlayPause", status.can_play_pause);
342 status_value.SetBoolean("canMute", status.can_mute); 342 status_value.SetBoolean("canMute", status.can_mute);
343 status_value.SetBoolean("canSetVolume", status.can_set_volume); 343 status_value.SetBoolean("canSetVolume", status.can_set_volume);
344 status_value.SetBoolean("canSeek", status.can_seek); 344 status_value.SetBoolean("canSeek", status.can_seek);
345 status_value.SetBoolean("isPaused", status.is_paused); 345 status_value.SetInteger("playState", static_cast<int>(status.play_state));
346 status_value.SetBoolean("isMuted", status.is_muted); 346 status_value.SetBoolean("isMuted", status.is_muted);
347 status_value.SetInteger("duration", status.duration.InSeconds()); 347 status_value.SetInteger("duration", status.duration.InSeconds());
348 status_value.SetInteger("currentTime", status.current_time.InSeconds()); 348 status_value.SetInteger("currentTime", status.current_time.InSeconds());
349 status_value.SetDouble("volume", status.volume); 349 status_value.SetDouble("volume", status.volume);
350 web_ui()->CallJavascriptFunctionUnsafe(kUpdateRouteStatus, 350 web_ui()->CallJavascriptFunctionUnsafe(kUpdateRouteStatus,
351 std::move(status_value)); 351 std::move(status_value));
352 } 352 }
353 353
354 void MediaRouterWebUIMessageHandler::OnRouteControllerInvalidated() { 354 void MediaRouterWebUIMessageHandler::OnRouteControllerInvalidated() {
355 web_ui()->CallJavascriptFunctionUnsafe(kOnRouteControllerInvalidated); 355 web_ui()->CallJavascriptFunctionUnsafe(kOnRouteControllerInvalidated);
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 } 1075 }
1076 1076
1077 return value; 1077 return value;
1078 } 1078 }
1079 1079
1080 void MediaRouterWebUIMessageHandler::SetWebUIForTest(content::WebUI* web_ui) { 1080 void MediaRouterWebUIMessageHandler::SetWebUIForTest(content::WebUI* web_ui) {
1081 set_web_ui(web_ui); 1081 set_web_ui(web_ui);
1082 } 1082 }
1083 1083
1084 } // namespace media_router 1084 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698