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

Side by Side Diff: extensions/common/permissions/socket_permission.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/common/permissions/socket_permission.h" 5 #include "extensions/common/permissions/socket_permission.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory>
8 9
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "extensions/common/api/sockets/sockets_manifest_permission.h" 12 #include "extensions/common/api/sockets/sockets_manifest_permission.h"
13 #include "extensions/common/permissions/permissions_info.h" 13 #include "extensions/common/permissions/permissions_info.h"
14 #include "extensions/common/permissions/set_disjunction_permission.h" 14 #include "extensions/common/permissions/set_disjunction_permission.h"
15 #include "grit/extensions_strings.h" 15 #include "grit/extensions_strings.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 17
18 namespace extensions { 18 namespace extensions {
19 19
20 namespace { 20 namespace {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 } 54 }
55 55
56 PermissionIDSet SocketPermission::GetPermissions() const { 56 PermissionIDSet SocketPermission::GetPermissions() const {
57 PermissionIDSet ids; 57 PermissionIDSet ids;
58 SocketPermissionEntrySet entries = ExtractSocketEntries(data_set_); 58 SocketPermissionEntrySet entries = ExtractSocketEntries(data_set_);
59 SocketsManifestPermission::AddSocketHostPermissions(entries, &ids); 59 SocketsManifestPermission::AddSocketHostPermissions(entries, &ids);
60 return ids; 60 return ids;
61 } 61 }
62 62
63 } // namespace extensions 63 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/permissions/settings_override_permission.cc ('k') | extensions/common/permissions/socket_permission_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698