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

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

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ Created 3 years, 9 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_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_ 6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/gtest_prod_util.h" 16 #include "base/gtest_prod_util.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/memory/scoped_vector.h"
19 #include "base/observer_list.h" 18 #include "base/observer_list.h"
20 #include "base/scoped_observer.h" 19 #include "base/scoped_observer.h"
21 #include "base/strings/string16.h" 20 #include "base/strings/string16.h"
22 #include "build/build_config.h" 21 #include "build/build_config.h"
23 #include "chrome/browser/net/file_downloader.h" 22 #include "chrome/browser/net/file_downloader.h"
24 #include "chrome/browser/supervised_user/experimental/safe_search_url_reporter.h " 23 #include "chrome/browser/supervised_user/experimental/safe_search_url_reporter.h "
25 #include "chrome/browser/supervised_user/experimental/supervised_user_blacklist. h" 24 #include "chrome/browser/supervised_user/experimental/supervised_user_blacklist. h"
26 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" 25 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
27 #include "chrome/browser/supervised_user/supervised_users.h" 26 #include "chrome/browser/supervised_user/supervised_users.h"
28 #include "chrome/browser/ui/browser_list_observer.h" 27 #include "chrome/browser/ui/browser_list_observer.h"
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 } blacklist_state_; 450 } blacklist_state_;
452 451
453 SupervisedUserBlacklist blacklist_; 452 SupervisedUserBlacklist blacklist_;
454 std::unique_ptr<FileDownloader> blacklist_downloader_; 453 std::unique_ptr<FileDownloader> blacklist_downloader_;
455 454
456 std::unique_ptr<SupervisedUserWhitelistService> whitelist_service_; 455 std::unique_ptr<SupervisedUserWhitelistService> whitelist_service_;
457 456
458 std::vector<scoped_refptr<SupervisedUserSiteList>> whitelists_; 457 std::vector<scoped_refptr<SupervisedUserSiteList>> whitelists_;
459 458
460 // Used to create permission requests. 459 // Used to create permission requests.
461 ScopedVector<PermissionRequestCreator> permissions_creators_; 460 std::vector<std::unique_ptr<PermissionRequestCreator>> permissions_creators_;
462 461
463 // Used to report inappropriate URLs to SafeSarch API. 462 // Used to report inappropriate URLs to SafeSarch API.
464 std::unique_ptr<SafeSearchURLReporter> url_reporter_; 463 std::unique_ptr<SafeSearchURLReporter> url_reporter_;
465 464
466 #if BUILDFLAG(ENABLE_EXTENSIONS) 465 #if BUILDFLAG(ENABLE_EXTENSIONS)
467 ScopedObserver<extensions::ExtensionRegistry, 466 ScopedObserver<extensions::ExtensionRegistry,
468 extensions::ExtensionRegistryObserver> 467 extensions::ExtensionRegistryObserver>
469 registry_observer_; 468 registry_observer_;
470 #endif 469 #endif
471 470
472 base::ObserverList<SupervisedUserServiceObserver> observer_list_; 471 base::ObserverList<SupervisedUserServiceObserver> observer_list_;
473 472
474 // Prevents Sync from running until configuration is complete. 473 // Prevents Sync from running until configuration is complete.
475 std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_; 474 std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
476 475
477 base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_; 476 base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_;
477
478 DISALLOW_COPY_AND_ASSIGN(SupervisedUserService);
478 }; 479 };
479 480
480 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_ 481 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698