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

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

Issue 1898953002: [Media Router WebUI] Handle route details in incognito. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « chrome/browser/resources/media_router/media_router_ui_interface.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 std::unique_ptr<base::ListValue> routes(RoutesToValue( 402 std::unique_ptr<base::ListValue> routes(RoutesToValue(
403 media_router_ui_->routes(), media_router_ui_->joinable_route_ids(), 403 media_router_ui_->routes(), media_router_ui_->joinable_route_ids(),
404 media_router_ui_->GetRouteProviderExtensionId())); 404 media_router_ui_->GetRouteProviderExtensionId()));
405 initial_data.Set("routes", routes.release()); 405 initial_data.Set("routes", routes.release());
406 406
407 const std::set<MediaCastMode> cast_modes = media_router_ui_->cast_modes(); 407 const std::set<MediaCastMode> cast_modes = media_router_ui_->cast_modes();
408 std::unique_ptr<base::ListValue> cast_modes_list(CastModesToValue( 408 std::unique_ptr<base::ListValue> cast_modes_list(CastModesToValue(
409 cast_modes, media_router_ui_->GetPresentationRequestSourceName())); 409 cast_modes, media_router_ui_->GetPresentationRequestSourceName()));
410 initial_data.Set("castModes", cast_modes_list.release()); 410 initial_data.Set("castModes", cast_modes_list.release());
411 411
412 Profile* profile = Profile::FromWebUI(web_ui());
413 initial_data.SetBoolean("isOffTheRecord", profile->IsOffTheRecord());
mark a. foltz 2016/04/19 18:24:24 There is already a per-route boolean that indicate
414
412 web_ui()->CallJavascriptFunction(kSetInitialData, initial_data); 415 web_ui()->CallJavascriptFunction(kSetInitialData, initial_data);
413 media_router_ui_->UIInitialized(); 416 media_router_ui_->UIInitialized();
414 } 417 }
415 418
416 void MediaRouterWebUIMessageHandler::OnCreateRoute( 419 void MediaRouterWebUIMessageHandler::OnCreateRoute(
417 const base::ListValue* args) { 420 const base::ListValue* args) {
418 DVLOG(1) << "OnCreateRoute"; 421 DVLOG(1) << "OnCreateRoute";
419 const base::DictionaryValue* args_dict = nullptr; 422 const base::DictionaryValue* args_dict = nullptr;
420 std::string sink_id; 423 std::string sink_id;
421 int cast_mode_num = -1; 424 int cast_mode_num = -1;
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 #endif // defined(GOOGLE_CHROME_BUILD) 819 #endif // defined(GOOGLE_CHROME_BUILD)
817 820
818 return AccountInfo(); 821 return AccountInfo();
819 } 822 }
820 823
821 void MediaRouterWebUIMessageHandler::SetWebUIForTest(content::WebUI* web_ui) { 824 void MediaRouterWebUIMessageHandler::SetWebUIForTest(content::WebUI* web_ui) {
822 set_web_ui(web_ui); 825 set_web_ui(web_ui);
823 } 826 }
824 827
825 } // namespace media_router 828 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/resources/media_router/media_router_ui_interface.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698