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

Side by Side Diff: chrome/browser/external_protocol/external_protocol_handler.cc

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 #include "chrome/browser/external_protocol/external_protocol_handler.h" 5 #include "chrome/browser/external_protocol/external_protocol_handler.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 int tab_contents_id, 95 int tab_contents_id,
96 bool prompt_user, 96 bool prompt_user,
97 ExternalProtocolHandler::Delegate* delegate) 97 ExternalProtocolHandler::Delegate* delegate)
98 : delegate_(delegate), 98 : delegate_(delegate),
99 escaped_url_(escaped_url), 99 escaped_url_(escaped_url),
100 render_process_host_id_(render_process_host_id), 100 render_process_host_id_(render_process_host_id),
101 tab_contents_id_(tab_contents_id), 101 tab_contents_id_(tab_contents_id),
102 prompt_user_(prompt_user) {} 102 prompt_user_(prompt_user) {}
103 103
104 virtual void SetDefaultWebClientUIState( 104 virtual void SetDefaultWebClientUIState(
105 ShellIntegration::DefaultWebClientUIState state) OVERRIDE { 105 ShellIntegration::DefaultWebClientUIState state) override {
106 DCHECK(base::MessageLoopForUI::IsCurrent()); 106 DCHECK(base::MessageLoopForUI::IsCurrent());
107 107
108 // If we are still working out if we're the default, or we've found 108 // If we are still working out if we're the default, or we've found
109 // out we definately are the default, we end here. 109 // out we definately are the default, we end here.
110 if (state == ShellIntegration::STATE_PROCESSING) { 110 if (state == ShellIntegration::STATE_PROCESSING) {
111 return; 111 return;
112 } 112 }
113 113
114 if (delegate_) 114 if (delegate_)
115 delegate_->FinishedProcessingCheck(); 115 delegate_->FinishedProcessingCheck();
(...skipping 12 matching lines...) Expand all
128 // protocol. 128 // protocol.
129 RunExternalProtocolDialogWithDelegate(escaped_url_, 129 RunExternalProtocolDialogWithDelegate(escaped_url_,
130 render_process_host_id_, tab_contents_id_, delegate_); 130 render_process_host_id_, tab_contents_id_, delegate_);
131 return; 131 return;
132 } 132 }
133 133
134 LaunchUrlWithoutSecurityCheckWithDelegate( 134 LaunchUrlWithoutSecurityCheckWithDelegate(
135 escaped_url_, render_process_host_id_, tab_contents_id_, delegate_); 135 escaped_url_, render_process_host_id_, tab_contents_id_, delegate_);
136 } 136 }
137 137
138 virtual bool IsOwnedByWorker() OVERRIDE { return true; } 138 virtual bool IsOwnedByWorker() override { return true; }
139 139
140 private: 140 private:
141 ExternalProtocolHandler::Delegate* delegate_; 141 ExternalProtocolHandler::Delegate* delegate_;
142 GURL escaped_url_; 142 GURL escaped_url_;
143 int render_process_host_id_; 143 int render_process_host_id_;
144 int tab_contents_id_; 144 int tab_contents_id_;
145 bool prompt_user_; 145 bool prompt_user_;
146 }; 146 };
147 147
148 } // namespace 148 } // namespace
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 // static 307 // static
308 void ExternalProtocolHandler::RegisterPrefs(PrefRegistrySimple* registry) { 308 void ExternalProtocolHandler::RegisterPrefs(PrefRegistrySimple* registry) {
309 registry->RegisterDictionaryPref(prefs::kExcludedSchemes); 309 registry->RegisterDictionaryPref(prefs::kExcludedSchemes);
310 } 310 }
311 311
312 // static 312 // static
313 void ExternalProtocolHandler::PermitLaunchUrl() { 313 void ExternalProtocolHandler::PermitLaunchUrl() {
314 DCHECK(base::MessageLoopForUI::IsCurrent()); 314 DCHECK(base::MessageLoopForUI::IsCurrent());
315 g_accept_requests = true; 315 g_accept_requests = true;
316 } 316 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698