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

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

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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_NAVIGATION_OBSERVER_H_ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_NAVIGATION_OBSERVER_H_
6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_NAVIGATION_OBSERVER_H_ 6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_NAVIGATION_OBSERVER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 private: 48 private:
49 friend class content::WebContentsUserData<SupervisedUserNavigationObserver>; 49 friend class content::WebContentsUserData<SupervisedUserNavigationObserver>;
50 50
51 explicit SupervisedUserNavigationObserver(content::WebContents* web_contents); 51 explicit SupervisedUserNavigationObserver(content::WebContents* web_contents);
52 52
53 // content::WebContentsObserver implementation. 53 // content::WebContentsObserver implementation.
54 virtual void DidCommitProvisionalLoadForFrame( 54 virtual void DidCommitProvisionalLoadForFrame(
55 content::RenderFrameHost* render_frame_host, 55 content::RenderFrameHost* render_frame_host,
56 const GURL& url, 56 const GURL& url,
57 ui::PageTransition transition_type) OVERRIDE; 57 ui::PageTransition transition_type) override;
58 58
59 void OnRequestBlockedInternal(const GURL& url); 59 void OnRequestBlockedInternal(const GURL& url);
60 60
61 // Owned by the profile, so outlives us. 61 // Owned by the profile, so outlives us.
62 SupervisedUserService* supervised_user_service_; 62 SupervisedUserService* supervised_user_service_;
63 63
64 // Owned by SupervisedUserService. 64 // Owned by SupervisedUserService.
65 const SupervisedUserURLFilter* url_filter_; 65 const SupervisedUserURLFilter* url_filter_;
66 66
67 // Owned by the InfoBarService, which has the same lifetime as this object. 67 // Owned by the InfoBarService, which has the same lifetime as this object.
68 infobars::InfoBar* warn_infobar_; 68 infobars::InfoBar* warn_infobar_;
69 69
70 ScopedVector<const content::NavigationEntry> blocked_navigations_; 70 ScopedVector<const content::NavigationEntry> blocked_navigations_;
71 71
72 DISALLOW_COPY_AND_ASSIGN(SupervisedUserNavigationObserver); 72 DISALLOW_COPY_AND_ASSIGN(SupervisedUserNavigationObserver);
73 }; 73 };
74 74
75 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_NAVIGATION_OBSERVER_H_ 75 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_NAVIGATION_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698