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

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

Issue 1173753003: [Media Router] Implement JoinRoute + update CreateRoute API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fix again x2 Created 5 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
« no previous file with comments | « chrome/browser/ui/webui/media_router/media_router_ui.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "chrome/browser/ui/webui/media_router/media_router_ui.h" 8 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "content/public/browser/web_ui.h" 10 #include "content/public/browser/web_ui.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 initial_settings.SetString("headerText", 168 initial_settings.SetString("headerText",
169 media_router_ui->GetInitialHeaderText()); 169 media_router_ui->GetInitialHeaderText());
170 170
171 scoped_ptr<base::ListValue> sinks(SinksToValue(media_router_ui->sinks())); 171 scoped_ptr<base::ListValue> sinks(SinksToValue(media_router_ui->sinks()));
172 initial_settings.Set("sinks", sinks.release()); 172 initial_settings.Set("sinks", sinks.release());
173 173
174 scoped_ptr<base::ListValue> routes(RoutesToValue(media_router_ui->routes())); 174 scoped_ptr<base::ListValue> routes(RoutesToValue(media_router_ui->routes()));
175 initial_settings.Set("routes", routes.release()); 175 initial_settings.Set("routes", routes.release());
176 176
177 scoped_ptr<base::ListValue> cast_modes(CastModesToValue( 177 scoped_ptr<base::ListValue> cast_modes(CastModesToValue(
178 media_router_ui->cast_modes(), 178 media_router_ui->cast_modes(), media_router_ui->GetFrameURLHost()));
179 // TODO(imcheng): Use media_router_ui->source_host() once DEFAULT mode
180 // is upstreamed.
181 std::string()));
182 initial_settings.Set("castModes", cast_modes.release()); 179 initial_settings.Set("castModes", cast_modes.release());
183 180
184 web_ui()->CallJavascriptFunction(kSetInitialSettings, initial_settings); 181 web_ui()->CallJavascriptFunction(kSetInitialSettings, initial_settings);
185 media_router_ui->UIInitialized(); 182 media_router_ui->UIInitialized();
186 } 183 }
187 184
188 void MediaRouterWebUIMessageHandler::OnCreateRoute( 185 void MediaRouterWebUIMessageHandler::OnCreateRoute(
189 const base::ListValue* args) { 186 const base::ListValue* args) {
190 std::string sink_id; 187 std::string sink_id;
191 int cast_mode_num; 188 int cast_mode_num;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 251
255 MediaRouterUI* MediaRouterWebUIMessageHandler::GetMediaRouterUI() const { 252 MediaRouterUI* MediaRouterWebUIMessageHandler::GetMediaRouterUI() const {
256 MediaRouterUI* media_router_ui = 253 MediaRouterUI* media_router_ui =
257 static_cast<MediaRouterUI*>(web_ui()->GetController()); 254 static_cast<MediaRouterUI*>(web_ui()->GetController());
258 DCHECK(media_router_ui); 255 DCHECK(media_router_ui);
259 return media_router_ui; 256 return media_router_ui;
260 } 257 }
261 258
262 } // namespace media_router 259 } // namespace media_router
263 260
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/media_router/media_router_ui.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698