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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.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
« no previous file with comments | « chrome/browser/ssl/ssl_add_certificate.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_SSL_SSL_BLOCKING_PAGE_H_ 5 #ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
6 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 6 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 // A method that sets strings in the specified dictionary from the passed 76 // A method that sets strings in the specified dictionary from the passed
77 // vector so that they can be used to resource the ssl_roadblock.html/ 77 // vector so that they can be used to resource the ssl_roadblock.html/
78 // ssl_error.html files. 78 // ssl_error.html files.
79 // Note: there can be up to 5 strings in |extra_info|. 79 // Note: there can be up to 5 strings in |extra_info|.
80 static void SetExtraInfo(base::DictionaryValue* strings, 80 static void SetExtraInfo(base::DictionaryValue* strings,
81 const std::vector<base::string16>& extra_info); 81 const std::vector<base::string16>& extra_info);
82 82
83 protected: 83 protected:
84 // InterstitialPageDelegate implementation. 84 // InterstitialPageDelegate implementation.
85 virtual std::string GetHTMLContents() OVERRIDE; 85 virtual std::string GetHTMLContents() override;
86 virtual void CommandReceived(const std::string& command) OVERRIDE; 86 virtual void CommandReceived(const std::string& command) override;
87 virtual void OverrideEntry(content::NavigationEntry* entry) OVERRIDE; 87 virtual void OverrideEntry(content::NavigationEntry* entry) override;
88 virtual void OverrideRendererPrefs( 88 virtual void OverrideRendererPrefs(
89 content::RendererPreferences* prefs) OVERRIDE; 89 content::RendererPreferences* prefs) override;
90 virtual void OnProceed() OVERRIDE; 90 virtual void OnProceed() override;
91 virtual void OnDontProceed() OVERRIDE; 91 virtual void OnDontProceed() override;
92 92
93 private: 93 private:
94 void NotifyDenyCertificate(); 94 void NotifyDenyCertificate();
95 void NotifyAllowCertificate(); 95 void NotifyAllowCertificate();
96 96
97 // Used to query the HistoryService to see if the URL is in history. For UMA. 97 // Used to query the HistoryService to see if the URL is in history. For UMA.
98 void OnGotHistoryCount(bool success, int num_visits, base::Time first_visit); 98 void OnGotHistoryCount(bool success, int num_visits, base::Time first_visit);
99 99
100 base::Callback<void(bool)> callback_; 100 base::Callback<void(bool)> callback_;
101 101
(...skipping 22 matching lines...) Expand all
124 // For Chrome Experience Sampling Platform: this maintains event state. 124 // For Chrome Experience Sampling Platform: this maintains event state.
125 scoped_ptr<extensions::ExperienceSamplingEvent> sampling_event_; 125 scoped_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
126 #endif 126 #endif
127 127
128 content::NotificationRegistrar registrar_; 128 content::NotificationRegistrar registrar_;
129 129
130 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage); 130 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
131 }; 131 };
132 132
133 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 133 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_add_certificate.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698