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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_site_list.h

Issue 1878143002: Convert //chrome/browser/supervised_user from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SITE_LIST_H_ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SITE_LIST_H_
6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SITE_LIST_H_ 6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SITE_LIST_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <array> 11 #include <array>
12 #include <memory>
12 #include <string> 13 #include <string>
13 #include <vector> 14 #include <vector>
14 15
15 #include "base/callback_forward.h" 16 #include "base/callback_forward.h"
16 #include "base/files/file_path.h" 17 #include "base/files/file_path.h"
17 #include "base/gtest_prod_util.h" 18 #include "base/gtest_prod_util.h"
18 #include "base/macros.h" 19 #include "base/macros.h"
19 #include "base/memory/ref_counted.h" 20 #include "base/memory/ref_counted.h"
20 #include "base/memory/scoped_ptr.h"
21 #include "base/sha1.h" 21 #include "base/sha1.h"
22 #include "base/strings/string16.h" 22 #include "base/strings/string16.h"
23 #include "base/time/time.h" 23 #include "base/time/time.h"
24 #include "url/gurl.h" 24 #include "url/gurl.h"
25 25
26 class Profile; 26 class Profile;
27 27
28 namespace base { 28 namespace base {
29 class DictionaryValue; 29 class DictionaryValue;
30 class ListValue; 30 class ListValue;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 ~SupervisedUserSiteList(); 101 ~SupervisedUserSiteList();
102 102
103 // Static private so it can access the private constructor. 103 // Static private so it can access the private constructor.
104 static void OnJsonLoaded( 104 static void OnJsonLoaded(
105 const std::string& id, 105 const std::string& id,
106 const base::string16& title, 106 const base::string16& title,
107 const base::FilePath& large_icon_path, 107 const base::FilePath& large_icon_path,
108 const base::FilePath& path, 108 const base::FilePath& path,
109 base::TimeTicks start_time, 109 base::TimeTicks start_time,
110 const SupervisedUserSiteList::LoadedCallback& callback, 110 const SupervisedUserSiteList::LoadedCallback& callback,
111 scoped_ptr<base::Value> value); 111 std::unique_ptr<base::Value> value);
112 112
113 std::string id_; 113 std::string id_;
114 base::string16 title_; 114 base::string16 title_;
115 GURL entry_point_; 115 GURL entry_point_;
116 base::FilePath large_icon_path_; 116 base::FilePath large_icon_path_;
117 117
118 // A list of URL patterns that should be whitelisted. 118 // A list of URL patterns that should be whitelisted.
119 std::vector<std::string> patterns_; 119 std::vector<std::string> patterns_;
120 120
121 // A list of SHA1 hashes of hostnames that should be whitelisted. 121 // A list of SHA1 hashes of hostnames that should be whitelisted.
122 std::vector<HostnameHash> hostname_hashes_; 122 std::vector<HostnameHash> hostname_hashes_;
123 123
124 DISALLOW_COPY_AND_ASSIGN(SupervisedUserSiteList); 124 DISALLOW_COPY_AND_ASSIGN(SupervisedUserSiteList);
125 }; 125 };
126 126
127 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SITE_LIST_H_ 127 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SITE_LIST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698