chromecast/browser/service/cast_service_simple.cc - Issue 853073003: Fix assertion starting cast_shell (breaking thread IO restrictions).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromecast/browser/service/cast_service_simple.cc

Issue 853073003: Fix assertion starting cast_shell (breaking thread IO restrictions). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Whitespace fixes plus task is not slow Created 5 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chromecast/browser/service/cast_service_simple.h ('k') | ui/events/ozone/device/device_manager_manual.h » ('j') | ui/events/ozone/device/device_manager_manual.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/browser/service/cast_service_simple.cc

diff --git a/chromecast/browser/service/cast_service_simple.cc b/chromecast/browser/service/cast_service_simple.cc

index 36f8b64bcc66eec55a396ff6997dbcf35c54e96b..9c7ca6d3fc6b8182ced4d8826b70b78cb0e804d1 100644

--- a/chromecast/browser/service/cast_service_simple.cc

+++ b/chromecast/browser/service/cast_service_simple.cc

@@ -10,7 +10,6 @@

#include "content/public/browser/web_contents.h"

#include "net/base/filename_util.h"

#include "net/url_request/url_request_context_getter.h"

-#include "url/gurl.h"

namespace chromecast {

@@ -54,6 +53,7 @@ CastServiceSimple::~CastServiceSimple() {

}

void CastServiceSimple::InitializeInternal() {

+ startup_url_ = GetStartupURL();

}

void CastServiceSimple::FinalizeInternal() {

@@ -67,8 +67,7 @@ void CastServiceSimple::StartInternal() {

web_contents_ = window_->CreateWebContents(initial_size, browser_context());

window_->CreateWindowTree(initial_size, web_contents_.get());

- web_contents_->GetController().LoadURL(GetStartupURL(),

- content::Referrer(),

+ web_contents_->GetController().LoadURL(startup_url_, content::Referrer(),

ui::PAGE_TRANSITION_TYPED,

std::string());

}