summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_protocol
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-07 03:02:08 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-07 03:02:08 +0000
commitb94584a231b160d2570cc38e78457fb852eb0c41 (patch)
tree8d03a214b0f7305c38eb8e2b6852015ae38fef07 /chrome/browser/external_protocol
parent8bc6596e0bdb39d1450d595bcc62244a5f3190b9 (diff)
downloadchromium_src-b94584a231b160d2570cc38e78457fb852eb0c41.zip
chromium_src-b94584a231b160d2570cc38e78457fb852eb0c41.tar.gz
chromium_src-b94584a231b160d2570cc38e78457fb852eb0c41.tar.bz2
Linux/ChromeOS Chromium style checker cleanup, chrome/browser edition.
Automated clean up of style checker errors that were missed due to the plugin not being executed on implementation files. BUG=115047 Review URL: https://codereview.chromium.org/12212048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_protocol')
-rw-r--r--chrome/browser/external_protocol/external_protocol_handler_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc
index 7651629..faf5704 100644
--- a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc
+++ b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc
@@ -46,14 +46,14 @@ class FakeExternalProtocolHandlerDelegate
virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
ShellIntegration::DefaultWebClientObserver* observer,
- const std::string& protocol) {
+ const std::string& protocol) OVERRIDE {
return new FakeExternalProtocolHandlerWorker(observer, protocol, os_state_);
}
virtual ExternalProtocolHandler::BlockState GetBlockState(
- const std::string& scheme) { return block_state_; }
+ const std::string& scheme) OVERRIDE { return block_state_; }
- virtual void BlockRequest() {
+ virtual void BlockRequest() OVERRIDE {
ASSERT_TRUE(block_state_ == ExternalProtocolHandler::BLOCK ||
os_state_ == ShellIntegration::IS_DEFAULT);
has_blocked_ = true;
@@ -61,19 +61,19 @@ class FakeExternalProtocolHandlerDelegate
virtual void RunExternalProtocolDialog(const GURL& url,
int render_process_host_id,
- int routing_id) {
+ int routing_id) OVERRIDE {
ASSERT_EQ(block_state_, ExternalProtocolHandler::UNKNOWN);
ASSERT_NE(os_state_, ShellIntegration::IS_DEFAULT);
has_prompted_ = true;
}
- virtual void LaunchUrlWithoutSecurityCheck(const GURL& url) {
+ virtual void LaunchUrlWithoutSecurityCheck(const GURL& url) OVERRIDE {
ASSERT_EQ(block_state_, ExternalProtocolHandler::DONT_BLOCK);
ASSERT_NE(os_state_, ShellIntegration::IS_DEFAULT);
has_launched_ = true;
}
- virtual void FinishedProcessingCheck() {
+ virtual void FinishedProcessingCheck() OVERRIDE {
MessageLoop::current()->Quit();
}