chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc - Issue 51433002: Enable permission warnings from ManifestHandlers.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc

Issue 51433002: Enable permission warnings from ManifestHandlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit test and clang presubmit errors. Created 7 years, 1 month 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/extensions/api/sockets_tcp/sockets_tcp_api.cc ('k') | chrome/browser/extensions/api/sockets_udp/sockets_udp_api.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/extensions/api/sockets_tcp_server/sockets_tcp_server_ap i.h"	5 #include "chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_ap i.h"

6	6

7 #include "chrome/browser/extensions/api/socket/tcp_socket.h"	7 #include "chrome/browser/extensions/api/socket/tcp_socket.h"

8 #include "chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_eve nt_dispatcher.h"	8 #include "chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_eve nt_dispatcher.h"

9 #include "chrome/common/extensions/api/sockets/sockets_handler.h"	9 #include "chrome/common/extensions/api/sockets/sockets_manifest_data.h"

10 #include "chrome/common/extensions/permissions/permissions_data.h"	10 #include "chrome/common/extensions/permissions/permissions_data.h"

11 #include "chrome/common/extensions/permissions/socket_permission.h"	11 #include "chrome/common/extensions/permissions/socket_permission.h"

12 #include "content/public/common/socket_permission_request.h"	12 #include "content/public/common/socket_permission_request.h"

13 #include "net/base/net_errors.h"	13 #include "net/base/net_errors.h"

14	14

15 using content::SocketPermissionRequest;	15 using content::SocketPermissionRequest;

16 using extensions::ResumableTCPServerSocket;	16 using extensions::ResumableTCPServerSocket;

17 using extensions::api::sockets_tcp_server::SocketInfo;	17 using extensions::api::sockets_tcp_server::SocketInfo;

18 using extensions::api::sockets_tcp_server::SocketProperties;	18 using extensions::api::sockets_tcp_server::SocketProperties;

19	19

(...skipping 269 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
289 if (socket) {	289 if (socket) {

290 socket_infos.push_back(CreateSocketInfo(socket_id, socket));	290 socket_infos.push_back(CreateSocketInfo(socket_id, socket));

291 }	291 }

292 }	292 }

293 }	293 }

294 results_ = sockets_tcp_server::GetSockets::Results::Create(socket_infos);	294 results_ = sockets_tcp_server::GetSockets::Results::Create(socket_infos);

295 }	295 }

296	296

297 } // namespace api	297 } // namespace api

298 } // namespace extensions	298 } // namespace extensions

OLD	NEW