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

Side by Side Diff: chrome/browser/infobars/infobar_service.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_INFOBARS_INFOBAR_SERVICE_H_ 5 #ifndef CHROME_BROWSER_INFOBARS_INFOBAR_SERVICE_H_
6 #define CHROME_BROWSER_INFOBARS_INFOBAR_SERVICE_H_ 6 #define CHROME_BROWSER_INFOBARS_INFOBAR_SERVICE_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // changes. 45 // changes.
46 void set_ignore_next_reload() { ignore_next_reload_ = true; } 46 void set_ignore_next_reload() { ignore_next_reload_ = true; }
47 47
48 private: 48 private:
49 friend class content::WebContentsUserData<InfoBarService>; 49 friend class content::WebContentsUserData<InfoBarService>;
50 50
51 explicit InfoBarService(content::WebContents* web_contents); 51 explicit InfoBarService(content::WebContents* web_contents);
52 virtual ~InfoBarService(); 52 virtual ~InfoBarService();
53 53
54 // InfoBarManager: 54 // InfoBarManager:
55 virtual int GetActiveEntryID() OVERRIDE; 55 virtual int GetActiveEntryID() override;
56 // TODO(droger): Remove these functions once infobar notifications are 56 // TODO(droger): Remove these functions once infobar notifications are
57 // removed. See http://crbug.com/354380 57 // removed. See http://crbug.com/354380
58 virtual void NotifyInfoBarAdded(infobars::InfoBar* infobar) OVERRIDE; 58 virtual void NotifyInfoBarAdded(infobars::InfoBar* infobar) override;
59 virtual void NotifyInfoBarRemoved(infobars::InfoBar* infobar, 59 virtual void NotifyInfoBarRemoved(infobars::InfoBar* infobar,
60 bool animate) OVERRIDE; 60 bool animate) override;
61 61
62 // content::WebContentsObserver: 62 // content::WebContentsObserver:
63 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; 63 virtual void RenderProcessGone(base::TerminationStatus status) override;
64 virtual void DidStartNavigationToPendingEntry( 64 virtual void DidStartNavigationToPendingEntry(
65 const GURL& url, 65 const GURL& url,
66 content::NavigationController::ReloadType reload_type) OVERRIDE; 66 content::NavigationController::ReloadType reload_type) override;
67 virtual void NavigationEntryCommitted( 67 virtual void NavigationEntryCommitted(
68 const content::LoadCommittedDetails& load_details) OVERRIDE; 68 const content::LoadCommittedDetails& load_details) override;
69 virtual void WebContentsDestroyed() OVERRIDE; 69 virtual void WebContentsDestroyed() override;
70 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 70 virtual bool OnMessageReceived(const IPC::Message& message) override;
71 71
72 // Message handlers. 72 // Message handlers.
73 void OnDidBlockDisplayingInsecureContent(); 73 void OnDidBlockDisplayingInsecureContent();
74 void OnDidBlockRunningInsecureContent(); 74 void OnDidBlockRunningInsecureContent();
75 75
76 // See description in set_ignore_next_reload(). 76 // See description in set_ignore_next_reload().
77 bool ignore_next_reload_; 77 bool ignore_next_reload_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(InfoBarService); 79 DISALLOW_COPY_AND_ASSIGN(InfoBarService);
80 }; 80 };
81 81
82 #endif // CHROME_BROWSER_INFOBARS_INFOBAR_SERVICE_H_ 82 #endif // CHROME_BROWSER_INFOBARS_INFOBAR_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/infobars/infobar_extension_api.h ('k') | chrome/browser/infobars/insecure_content_infobar_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698