extensions/browser/api/cast_channel/cast_channel_api.cc - Issue 1226353004: Generate all extension schema namespaces as "api" and instead vary the generated bundle names.

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: extensions/browser/api/cast_channel/cast_channel_api.cc

Issue 1226353004: Generate all extension schema namespaces as "api" and instead vary the generated bundle names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 5 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 | « extensions/browser/api/cast_channel/cast_channel_api.h ('k') | extensions/browser/api/cast_channel/cast_channel_api_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/cast_channel/cast_channel_api.cc

diff --git a/extensions/browser/api/cast_channel/cast_channel_api.cc b/extensions/browser/api/cast_channel/cast_channel_api.cc

index 3ec0b63bd665d620c846fc1609484e5c42c0b6d8..322cf159fb7b38810c1e06b864ce667082d5474e 100644

--- a/extensions/browser/api/cast_channel/cast_channel_api.cc

+++ b/extensions/browser/api/cast_channel/cast_channel_api.cc

@@ -320,14 +320,14 @@ void CastChannelOpenFunction::AsyncWorkStart() {

api_->GetLogger()->LogNewSocketEvent(*socket);

// Construct read delegates.

- scoped_ptr<core_api::cast_channel::CastTransport::Delegate> delegate(

+ scoped_ptr<api::cast_channel::CastTransport::Delegate> delegate(

make_scoped_ptr(new CastMessageHandler(

base::Bind(&CastChannelAPI::SendEvent, api_->AsWeakPtr()), socket,

api_->GetLogger())));

if (socket->keep_alive()) {

// Wrap read delegate in a KeepAliveDelegate for timeout handling.

- core_api::cast_channel::KeepAliveDelegate* keep_alive =

- new core_api::cast_channel::KeepAliveDelegate(

+ api::cast_channel::KeepAliveDelegate* keep_alive =

+ new api::cast_channel::KeepAliveDelegate(

socket, api_->GetLogger(), delegate.Pass(), ping_interval_,

liveness_timeout_);

scoped_ptr<base::Timer> injected_timer =