Chromium Code Reviews| Index: chrome/browser/supervised_user/supervised_user_navigation_observer.h |
| diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.h b/chrome/browser/supervised_user/supervised_user_navigation_observer.h |
| index 6149e616ce8ea4a58d99be63c1bf03d8f97e3c62..3400881f74a2a1d005bc02670da38ae1edceef4b 100644 |
| --- a/chrome/browser/supervised_user/supervised_user_navigation_observer.h |
| +++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.h |
| @@ -11,6 +11,7 @@ |
| #include "chrome/browser/supervised_user/supervised_user_service_observer.h" |
| #include "chrome/browser/supervised_user/supervised_user_url_filter.h" |
| #include "chrome/browser/supervised_user/supervised_users.h" |
| +#include "components/sessions/core/serialized_navigation_entry.h" |
| #include "content/public/browser/web_contents_user_data.h" |
| class SupervisedUserService; |
| @@ -26,8 +27,8 @@ class SupervisedUserNavigationObserver |
| public: |
| ~SupervisedUserNavigationObserver() override; |
| - const std::vector<const content::NavigationEntry*>* |
| - blocked_navigations() const { |
| + const std::vector<const sessions::SerializedNavigationEntry*>* |
| + blocked_navigations() const { |
| return &blocked_navigations_.get(); |
| } |
| @@ -63,7 +64,7 @@ class SupervisedUserNavigationObserver |
| // Owned by SupervisedUserServiceFactory (lifetime of Profile). |
| SupervisedUserService* supervised_user_service_; |
| - ScopedVector<const content::NavigationEntry> blocked_navigations_; |
| + ScopedVector<const sessions::SerializedNavigationEntry> blocked_navigations_; |
|
Bernhard Bauer
2015/10/16 10:37:33
If SerializedNavigationEntry is copyable (and we a
Nicolas Zea
2015/10/20 23:14:41
It is copyable, but that could be fairly expensive
Bernhard Bauer
2015/10/21 10:48:34
Hm, in that case...
1. Wouldn't it make sense to m
Nicolas Zea
2015/10/22 00:29:11
It's not so much that making copies is bad, as tha
|
| base::WeakPtrFactory<SupervisedUserNavigationObserver> weak_ptr_factory_; |