Commit 679f9f3e authored by avi@chromium.org's avatar avi@chromium.org

Add OVERRIDE to chrome/test/.

BUG=104314
TEST=no change

Review URL: http://codereview.chromium.org/8558032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110793 0039d316-1c4b-4281-b951-d872f2087c98
parent 3bb9614b
...@@ -44,7 +44,7 @@ class BrowserWithTestWindowTest : public testing::Test { ...@@ -44,7 +44,7 @@ class BrowserWithTestWindowTest : public testing::Test {
BrowserWithTestWindowTest(); BrowserWithTestWindowTest();
virtual ~BrowserWithTestWindowTest(); virtual ~BrowserWithTestWindowTest();
virtual void SetUp(); virtual void SetUp() OVERRIDE;
// Returns the current RenderViewHost for the current tab as a // Returns the current RenderViewHost for the current tab as a
// TestRenderViewHost. // TestRenderViewHost.
......
...@@ -27,8 +27,8 @@ class ChromeRenderViewTest : public content::RenderViewTest { ...@@ -27,8 +27,8 @@ class ChromeRenderViewTest : public content::RenderViewTest {
protected: protected:
// testing::Test // testing::Test
virtual void SetUp(); virtual void SetUp() OVERRIDE;
virtual void TearDown(); virtual void TearDown() OVERRIDE;
chrome::ChromeContentRendererClient chrome_content_renderer_client_; chrome::ChromeContentRendererClient chrome_content_renderer_client_;
ExtensionDispatcher* extension_dispatcher_; ExtensionDispatcher* extension_dispatcher_;
......
...@@ -23,8 +23,8 @@ class ChromeTestSuite : public base::TestSuite { ...@@ -23,8 +23,8 @@ class ChromeTestSuite : public base::TestSuite {
virtual ~ChromeTestSuite(); virtual ~ChromeTestSuite();
protected: protected:
virtual void Initialize(); virtual void Initialize() OVERRIDE;
virtual void Shutdown(); virtual void Shutdown() OVERRIDE;
void SetBrowserDirectory(const FilePath& browser_dir) { void SetBrowserDirectory(const FilePath& browser_dir) {
browser_dir_ = browser_dir; browser_dir_ = browser_dir;
......
...@@ -24,15 +24,17 @@ class MenuModelTest { ...@@ -24,15 +24,17 @@ class MenuModelTest {
public: public:
Delegate() : execute_count_(0), enable_count_(0) { } Delegate() : execute_count_(0), enable_count_(0) { }
virtual bool IsCommandIdChecked(int command_id) const { return false; } virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
virtual bool IsCommandIdEnabled(int command_id) const { return false;
}
virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
++enable_count_; ++enable_count_;
return true; return true;
} }
virtual bool GetAcceleratorForCommandId( virtual bool GetAcceleratorForCommandId(
int command_id, int command_id,
ui::Accelerator* accelerator) { return false; } ui::Accelerator* accelerator) OVERRIDE { return false; }
virtual void ExecuteCommand(int command_id) { ++execute_count_; } virtual void ExecuteCommand(int command_id) OVERRIDE { ++execute_count_; }
int execute_count_; int execute_count_;
mutable int enable_count_; mutable int enable_count_;
......
...@@ -24,8 +24,9 @@ class TestURLRequestContextGetter : public net::URLRequestContextGetter { ...@@ -24,8 +24,9 @@ class TestURLRequestContextGetter : public net::URLRequestContextGetter {
virtual ~TestURLRequestContextGetter(); virtual ~TestURLRequestContextGetter();
// net::URLRequestContextGetter implementation. // net::URLRequestContextGetter implementation.
virtual net::URLRequestContext* GetURLRequestContext(); virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const; virtual scoped_refptr<base::MessageLoopProxy>
GetIOMessageLoopProxy() const OVERRIDE;
private: private:
scoped_refptr<net::URLRequestContext> context_; scoped_refptr<net::URLRequestContext> context_;
......
This diff is collapsed.
...@@ -352,7 +352,7 @@ class TestNotificationObserver : public content::NotificationObserver { ...@@ -352,7 +352,7 @@ class TestNotificationObserver : public content::NotificationObserver {
// content::NotificationObserver: // content::NotificationObserver:
virtual void Observe(int type, virtual void Observe(int type,
const content::NotificationSource& source, const content::NotificationSource& source,
const content::NotificationDetails& details); const content::NotificationDetails& details) OVERRIDE;
private: private:
content::NotificationSource source_; content::NotificationSource source_;
...@@ -536,7 +536,7 @@ class DOMMessageQueue : public content::NotificationObserver { ...@@ -536,7 +536,7 @@ class DOMMessageQueue : public content::NotificationObserver {
// Overridden content::NotificationObserver methods. // Overridden content::NotificationObserver methods.
virtual void Observe(int type, virtual void Observe(int type,
const content::NotificationSource& source, const content::NotificationSource& source,
const content::NotificationDetails& details); const content::NotificationDetails& details) OVERRIDE;
private: private:
content::NotificationRegistrar registrar_; content::NotificationRegistrar registrar_;
......
...@@ -17,7 +17,7 @@ class AutomatedUITestBase : public UITest { ...@@ -17,7 +17,7 @@ class AutomatedUITestBase : public UITest {
AutomatedUITestBase(); AutomatedUITestBase();
virtual ~AutomatedUITestBase(); virtual ~AutomatedUITestBase();
virtual void SetUp(); virtual void SetUp() OVERRIDE;
virtual void LogErrorMessage(const std::string &error); virtual void LogErrorMessage(const std::string &error);
virtual void LogWarningMessage(const std::string &warning); virtual void LogWarningMessage(const std::string &warning);
......
// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -353,20 +353,20 @@ class AutomatedUITest : public AutomatedUITestBase { ...@@ -353,20 +353,20 @@ class AutomatedUITest : public AutomatedUITestBase {
bool DidCrash(bool update_total_crashes); bool DidCrash(bool update_total_crashes);
// Override the message logging in AutomatedUITestBase. // Override the message logging in AutomatedUITestBase.
virtual void LogErrorMessage(const std::string& error); virtual void LogErrorMessage(const std::string& error) OVERRIDE;
virtual void LogWarningMessage(const std::string& warning); virtual void LogWarningMessage(const std::string& warning) OVERRIDE;
virtual void LogInfoMessage(const std::string& info); virtual void LogInfoMessage(const std::string& info) OVERRIDE;
// Overridden so that UI Test doesn't set up when the tests start. // Overridden so that UI Test doesn't set up when the tests start.
// We use DoAction("SetUp") to set up, because it logs it and makes // We use DoAction("SetUp") to set up, because it logs it and makes
// it easier to check for crashes when we start the browser. // it easier to check for crashes when we start the browser.
virtual void SetUp() {} virtual void SetUp() OVERRIDE {}
// Overridden so that UI Test doesn't close the browser (which is already // Overridden so that UI Test doesn't close the browser (which is already
// closed) at the end of the test. // closed) at the end of the test.
// We use DoAction("TearDown") to tear down, because it logs it and makes // We use DoAction("TearDown") to tear down, because it logs it and makes
// it easier to check for crashes when we close the browser. // it easier to check for crashes when we close the browser.
virtual void TearDown() {} virtual void TearDown() OVERRIDE {}
private: private:
// Parses the init file. // Parses the init file.
......
// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -18,7 +18,7 @@ extern const char kTestCompleteSuccess[]; ...@@ -18,7 +18,7 @@ extern const char kTestCompleteSuccess[];
class NPAPITesterBase : public UITest { class NPAPITesterBase : public UITest {
protected: protected:
explicit NPAPITesterBase(); explicit NPAPITesterBase();
virtual void SetUp(); virtual void SetUp() OVERRIDE;
FilePath GetPluginsDirectory(); FilePath GetPluginsDirectory();
}; };
...@@ -27,13 +27,13 @@ class NPAPITesterBase : public UITest { ...@@ -27,13 +27,13 @@ class NPAPITesterBase : public UITest {
// to be visible. // to be visible.
class NPAPIVisiblePluginTester : public NPAPITesterBase { class NPAPIVisiblePluginTester : public NPAPITesterBase {
protected: protected:
virtual void SetUp(); virtual void SetUp() OVERRIDE;
}; };
// Helper class for NPAPI plugin UI tests which use incognito mode. // Helper class for NPAPI plugin UI tests which use incognito mode.
class NPAPIIncognitoTester : public NPAPITesterBase { class NPAPIIncognitoTester : public NPAPITesterBase {
protected: protected:
virtual void SetUp(); virtual void SetUp() OVERRIDE;
}; };
#endif // CHROME_TEST_UI_NPAPI_TEST_HELPER_H_ #endif // CHROME_TEST_UI_NPAPI_TEST_HELPER_H_
...@@ -367,10 +367,10 @@ class UITest : public UITestBase, public PlatformTest { ...@@ -367,10 +367,10 @@ class UITest : public UITestBase, public PlatformTest {
: UITestBase(), PlatformTest(), message_loop_(msg_loop_type) { : UITestBase(), PlatformTest(), message_loop_(msg_loop_type) {
} }
virtual void SetUp(); virtual void SetUp() OVERRIDE;
virtual void TearDown(); virtual void TearDown() OVERRIDE;
virtual ProxyLauncher* CreateProxyLauncher(); virtual ProxyLauncher* CreateProxyLauncher() OVERRIDE;
// Count the number of active browser processes launched by this test. // Count the number of active browser processes launched by this test.
// The count includes browser sub-processes. // The count includes browser sub-processes.
......
...@@ -18,8 +18,8 @@ class UITestSuite : public ChromeTestSuite { ...@@ -18,8 +18,8 @@ class UITestSuite : public ChromeTestSuite {
UITestSuite(int argc, char** argv); UITestSuite(int argc, char** argv);
protected: protected:
virtual void Initialize(); virtual void Initialize() OVERRIDE;
virtual void Shutdown(); virtual void Shutdown() OVERRIDE;
private: private:
#if defined(OS_WIN) #if defined(OS_WIN)
......
...@@ -25,10 +25,10 @@ class AlertTextCommand : public WebDriverCommand { ...@@ -25,10 +25,10 @@ class AlertTextCommand : public WebDriverCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~AlertTextCommand(); virtual ~AlertTextCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(AlertTextCommand); DISALLOW_COPY_AND_ASSIGN(AlertTextCommand);
...@@ -40,8 +40,8 @@ class AcceptAlertCommand : public WebDriverCommand { ...@@ -40,8 +40,8 @@ class AcceptAlertCommand : public WebDriverCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~AcceptAlertCommand(); virtual ~AcceptAlertCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(AcceptAlertCommand); DISALLOW_COPY_AND_ASSIGN(AcceptAlertCommand);
...@@ -53,8 +53,8 @@ class DismissAlertCommand : public WebDriverCommand { ...@@ -53,8 +53,8 @@ class DismissAlertCommand : public WebDriverCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~DismissAlertCommand(); virtual ~DismissAlertCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(DismissAlertCommand); DISALLOW_COPY_AND_ASSIGN(DismissAlertCommand);
......
...@@ -24,10 +24,10 @@ class AppCacheStatusCommand : public WebDriverCommand { ...@@ -24,10 +24,10 @@ class AppCacheStatusCommand : public WebDriverCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~AppCacheStatusCommand(); virtual ~AppCacheStatusCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
// A call with HTTP GET will return the status of the appcahe. // A call with HTTP GET will return the status of the appcahe.
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(AppCacheStatusCommand); DISALLOW_COPY_AND_ASSIGN(AppCacheStatusCommand);
......
...@@ -27,10 +27,10 @@ class BrowserConnectionCommand : public WebDriverCommand { ...@@ -27,10 +27,10 @@ class BrowserConnectionCommand : public WebDriverCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~BrowserConnectionCommand(); virtual ~BrowserConnectionCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
// A call with HTTP GET will return the browser connection state. // A call with HTTP GET will return the browser connection state.
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(BrowserConnectionCommand); DISALLOW_COPY_AND_ASSIGN(BrowserConnectionCommand);
......
...@@ -30,13 +30,13 @@ class CookieCommand : public WebDriverCommand { ...@@ -30,13 +30,13 @@ class CookieCommand : public WebDriverCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~CookieCommand(); virtual ~CookieCommand();
virtual bool DoesDelete(); virtual bool DoesDelete() OVERRIDE;
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecuteDelete(Response* const response); virtual void ExecuteDelete(Response* const response) OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(CookieCommand); DISALLOW_COPY_AND_ASSIGN(CookieCommand);
...@@ -51,11 +51,11 @@ class NamedCookieCommand : public WebDriverCommand { ...@@ -51,11 +51,11 @@ class NamedCookieCommand : public WebDriverCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~NamedCookieCommand(); virtual ~NamedCookieCommand();
virtual bool Init(Response* const response); virtual bool Init(Response* const response) OVERRIDE;
virtual bool DoesDelete(); virtual bool DoesDelete() OVERRIDE;
virtual void ExecuteDelete(Response* const response); virtual void ExecuteDelete(Response* const response) OVERRIDE;
private: private:
std::string cookie_name_; std::string cookie_name_;
......
...@@ -26,8 +26,8 @@ class CreateSession : public Command { ...@@ -26,8 +26,8 @@ class CreateSession : public Command {
const DictionaryValue* const parameters); const DictionaryValue* const parameters);
virtual ~CreateSession(); virtual ~CreateSession();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(CreateSession); DISALLOW_COPY_AND_ASSIGN(CreateSession);
......
...@@ -29,8 +29,8 @@ class ExecuteAsyncScriptCommand : public WebDriverCommand { ...@@ -29,8 +29,8 @@ class ExecuteAsyncScriptCommand : public WebDriverCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~ExecuteAsyncScriptCommand(); virtual ~ExecuteAsyncScriptCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ExecuteAsyncScriptCommand); DISALLOW_COPY_AND_ASSIGN(ExecuteAsyncScriptCommand);
......
...@@ -26,8 +26,8 @@ class ExecuteCommand : public WebDriverCommand { ...@@ -26,8 +26,8 @@ class ExecuteCommand : public WebDriverCommand {
const DictionaryValue* const parameters); const DictionaryValue* const parameters);
virtual ~ExecuteCommand(); virtual ~ExecuteCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ExecuteCommand); DISALLOW_COPY_AND_ASSIGN(ExecuteCommand);
......
...@@ -23,8 +23,8 @@ class FindElementCommand : public WebDriverCommand { ...@@ -23,8 +23,8 @@ class FindElementCommand : public WebDriverCommand {
const bool find_one_element); const bool find_one_element);
virtual ~FindElementCommand(); virtual ~FindElementCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
const bool find_one_element_; const bool find_one_element_;
......
...@@ -27,8 +27,8 @@ class MoveAndClickCommand : public WebElementCommand { ...@@ -27,8 +27,8 @@ class MoveAndClickCommand : public WebElementCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~MoveAndClickCommand(); virtual ~MoveAndClickCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(MoveAndClickCommand); DISALLOW_COPY_AND_ASSIGN(MoveAndClickCommand);
...@@ -42,8 +42,8 @@ class HoverCommand : public WebElementCommand { ...@@ -42,8 +42,8 @@ class HoverCommand : public WebElementCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~HoverCommand(); virtual ~HoverCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(HoverCommand); DISALLOW_COPY_AND_ASSIGN(HoverCommand);
...@@ -58,9 +58,9 @@ class DragCommand : public WebElementCommand { ...@@ -58,9 +58,9 @@ class DragCommand : public WebElementCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~DragCommand(); virtual ~DragCommand();
virtual bool Init(Response* const response); virtual bool Init(Response* const response) OVERRIDE;
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
int drag_x_, drag_y_; int drag_x_, drag_y_;
...@@ -80,7 +80,7 @@ class AdvancedMouseCommand : public WebDriverCommand { ...@@ -80,7 +80,7 @@ class AdvancedMouseCommand : public WebDriverCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~AdvancedMouseCommand(); virtual ~AdvancedMouseCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(AdvancedMouseCommand); DISALLOW_COPY_AND_ASSIGN(AdvancedMouseCommand);
...@@ -97,8 +97,8 @@ class MoveToCommand : public AdvancedMouseCommand { ...@@ -97,8 +97,8 @@ class MoveToCommand : public AdvancedMouseCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~MoveToCommand(); virtual ~MoveToCommand();
virtual bool Init(Response* const response); virtual bool Init(Response* const response) OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
bool has_element_; bool has_element_;
...@@ -121,8 +121,8 @@ class ClickCommand : public AdvancedMouseCommand { ...@@ -121,8 +121,8 @@ class ClickCommand : public AdvancedMouseCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~ClickCommand(); virtual ~ClickCommand();
virtual bool Init(Response* const response); virtual bool Init(Response* const response) OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
int button_; int button_;
...@@ -141,7 +141,7 @@ class ButtonDownCommand : public AdvancedMouseCommand { ...@@ -141,7 +141,7 @@ class ButtonDownCommand : public AdvancedMouseCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~ButtonDownCommand(); virtual ~ButtonDownCommand();
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ButtonDownCommand); DISALLOW_COPY_AND_ASSIGN(ButtonDownCommand);
...@@ -157,7 +157,7 @@ class ButtonUpCommand : public AdvancedMouseCommand { ...@@ -157,7 +157,7 @@ class ButtonUpCommand : public AdvancedMouseCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~ButtonUpCommand(); virtual ~ButtonUpCommand();
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ButtonUpCommand); DISALLOW_COPY_AND_ASSIGN(ButtonUpCommand);
...@@ -171,7 +171,7 @@ class DoubleClickCommand : public AdvancedMouseCommand { ...@@ -171,7 +171,7 @@ class DoubleClickCommand : public AdvancedMouseCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~DoubleClickCommand(); virtual ~DoubleClickCommand();
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(DoubleClickCommand); DISALLOW_COPY_AND_ASSIGN(DoubleClickCommand);
......
...@@ -22,8 +22,8 @@ class ForwardCommand : public WebDriverCommand { ...@@ -22,8 +22,8 @@ class ForwardCommand : public WebDriverCommand {
const DictionaryValue* const parameters); const DictionaryValue* const parameters);
virtual ~ForwardCommand(); virtual ~ForwardCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ForwardCommand); DISALLOW_COPY_AND_ASSIGN(ForwardCommand);
...@@ -37,8 +37,8 @@ class BackCommand : public WebDriverCommand { ...@@ -37,8 +37,8 @@ class BackCommand : public WebDriverCommand {
const DictionaryValue* const parameters); const DictionaryValue* const parameters);
virtual ~BackCommand(); virtual ~BackCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(BackCommand); DISALLOW_COPY_AND_ASSIGN(BackCommand);
...@@ -52,8 +52,8 @@ class RefreshCommand : public WebDriverCommand { ...@@ -52,8 +52,8 @@ class RefreshCommand : public WebDriverCommand {
const DictionaryValue* const parameters); const DictionaryValue* const parameters);
virtual ~RefreshCommand(); virtual ~RefreshCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(RefreshCommand); DISALLOW_COPY_AND_ASSIGN(RefreshCommand);
......
...@@ -26,8 +26,8 @@ class ScreenshotCommand : public WebDriverCommand { ...@@ -26,8 +26,8 @@ class ScreenshotCommand : public WebDriverCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~ScreenshotCommand(); virtual ~ScreenshotCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ScreenshotCommand); DISALLOW_COPY_AND_ASSIGN(ScreenshotCommand);
......
...@@ -28,11 +28,11 @@ class SessionWithID : public WebDriverCommand { ...@@ -28,11 +28,11 @@ class SessionWithID : public WebDriverCommand {
const DictionaryValue* const parameters); const DictionaryValue* const parameters);
virtual ~SessionWithID(); virtual ~SessionWithID();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual bool DoesDelete(); virtual bool DoesDelete() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
virtual void ExecuteDelete(Response* const response); virtual void ExecuteDelete(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(SessionWithID); DISALLOW_COPY_AND_ASSIGN(SessionWithID);
......
...@@ -24,8 +24,8 @@ class SetTimeoutCommand : public WebDriverCommand { ...@@ -24,8 +24,8 @@ class SetTimeoutCommand : public WebDriverCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~SetTimeoutCommand(); virtual ~SetTimeoutCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
virtual void SetTimeout(int timeout_ms) = 0; virtual void SetTimeout(int timeout_ms) = 0;
private: private:
...@@ -38,7 +38,7 @@ class SetAsyncScriptTimeoutCommand : public SetTimeoutCommand { ...@@ -38,7 +38,7 @@ class SetAsyncScriptTimeoutCommand : public SetTimeoutCommand {
SetAsyncScriptTimeoutCommand(const std::vector<std::string>& path_segments, SetAsyncScriptTimeoutCommand(const std::vector<std::string>& path_segments,
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~SetAsyncScriptTimeoutCommand(); virtual ~SetAsyncScriptTimeoutCommand();
virtual void SetTimeout(int timeout_ms); virtual void SetTimeout(int timeout_ms) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(SetAsyncScriptTimeoutCommand); DISALLOW_COPY_AND_ASSIGN(SetAsyncScriptTimeoutCommand);
...@@ -50,7 +50,7 @@ class ImplicitWaitCommand : public SetTimeoutCommand { ...@@ -50,7 +50,7 @@ class ImplicitWaitCommand : public SetTimeoutCommand {
ImplicitWaitCommand(const std::vector<std::string>& path_segments, ImplicitWaitCommand(const std::vector<std::string>& path_segments,
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~ImplicitWaitCommand(); virtual ~ImplicitWaitCommand();
virtual void SetTimeout(int timeout_ms); virtual void SetTimeout(int timeout_ms) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ImplicitWaitCommand); DISALLOW_COPY_AND_ASSIGN(ImplicitWaitCommand);
......
...@@ -26,8 +26,8 @@ class SourceCommand : public WebDriverCommand { ...@@ -26,8 +26,8 @@ class SourceCommand : public WebDriverCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~SourceCommand(); virtual ~SourceCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(SourceCommand); DISALLOW_COPY_AND_ASSIGN(SourceCommand);
......
...@@ -27,8 +27,8 @@ class WindowHandleCommand : public WebDriverCommand { ...@@ -27,8 +27,8 @@ class WindowHandleCommand : public WebDriverCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~WindowHandleCommand(); virtual ~WindowHandleCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(WindowHandleCommand); DISALLOW_COPY_AND_ASSIGN(WindowHandleCommand);
...@@ -42,8 +42,8 @@ class WindowHandlesCommand : public WebDriverCommand { ...@@ -42,8 +42,8 @@ class WindowHandlesCommand : public WebDriverCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~WindowHandlesCommand(); virtual ~WindowHandlesCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(WindowHandlesCommand); DISALLOW_COPY_AND_ASSIGN(WindowHandlesCommand);
...@@ -58,10 +58,10 @@ class WindowCommand : public WebDriverCommand { ...@@ -58,10 +58,10 @@ class WindowCommand : public WebDriverCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~WindowCommand(); virtual ~WindowCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual bool DoesDelete(); virtual bool DoesDelete() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
virtual void ExecuteDelete(Response* const response); virtual void ExecuteDelete(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(WindowCommand); DISALLOW_COPY_AND_ASSIGN(WindowCommand);
...@@ -75,8 +75,8 @@ class SwitchFrameCommand : public WebDriverCommand { ...@@ -75,8 +75,8 @@ class SwitchFrameCommand : public WebDriverCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~SwitchFrameCommand(); virtual ~SwitchFrameCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
bool GetWebElementParameter(const std::string& key, ElementId* out) const; bool GetWebElementParameter(const std::string& key, ElementId* out) const;
...@@ -91,8 +91,8 @@ class ActiveElementCommand : public WebDriverCommand { ...@@ -91,8 +91,8 @@ class ActiveElementCommand : public WebDriverCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ActiveElementCommand(); virtual ~ActiveElementCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ActiveElementCommand); DISALLOW_COPY_AND_ASSIGN(ActiveElementCommand);
......
...@@ -22,8 +22,8 @@ class TitleCommand : public WebDriverCommand { ...@@ -22,8 +22,8 @@ class TitleCommand : public WebDriverCommand {
const DictionaryValue* const parameters); const DictionaryValue* const parameters);
virtual ~TitleCommand(); virtual ~TitleCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(TitleCommand); DISALLOW_COPY_AND_ASSIGN(TitleCommand);
......
...@@ -23,10 +23,10 @@ class URLCommand : public WebDriverCommand { ...@@ -23,10 +23,10 @@ class URLCommand : public WebDriverCommand {
const DictionaryValue* const parameters); const DictionaryValue* const parameters);
virtual ~URLCommand(); virtual ~URLCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(URLCommand); DISALLOW_COPY_AND_ASSIGN(URLCommand);
......
...@@ -32,9 +32,9 @@ class WebDriverCommand : public Command { ...@@ -32,9 +32,9 @@ class WebDriverCommand : public Command {
virtual ~WebDriverCommand(); virtual ~WebDriverCommand();
// Initializes this webdriver command by fetching the command session. // Initializes this webdriver command by fetching the command session.
virtual bool Init(Response* const response); virtual bool Init(Response* const response) OVERRIDE;
virtual void Finish(); virtual void Finish() OVERRIDE;
protected: protected:
Session* session_; Session* session_;
......
...@@ -32,7 +32,7 @@ class WebElementCommand : public WebDriverCommand { ...@@ -32,7 +32,7 @@ class WebElementCommand : public WebDriverCommand {
const base::DictionaryValue* const parameters); const base::DictionaryValue* const parameters);
virtual ~WebElementCommand(); virtual ~WebElementCommand();
virtual bool Init(Response* const response); virtual bool Init(Response* const response) OVERRIDE;
protected: protected:
const std::vector<std::string>& path_segments_; const std::vector<std::string>& path_segments_;
...@@ -50,8 +50,8 @@ class ElementAttributeCommand : public WebElementCommand { ...@@ -50,8 +50,8 @@ class ElementAttributeCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementAttributeCommand(); virtual ~ElementAttributeCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementAttributeCommand); DISALLOW_COPY_AND_ASSIGN(ElementAttributeCommand);
...@@ -65,8 +65,8 @@ class ElementClearCommand : public WebElementCommand { ...@@ -65,8 +65,8 @@ class ElementClearCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementClearCommand(); virtual ~ElementClearCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementClearCommand); DISALLOW_COPY_AND_ASSIGN(ElementClearCommand);
...@@ -80,8 +80,8 @@ class ElementCssCommand : public WebElementCommand { ...@@ -80,8 +80,8 @@ class ElementCssCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementCssCommand(); virtual ~ElementCssCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementCssCommand); DISALLOW_COPY_AND_ASSIGN(ElementCssCommand);
...@@ -95,8 +95,8 @@ class ElementDisplayedCommand : public WebElementCommand { ...@@ -95,8 +95,8 @@ class ElementDisplayedCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementDisplayedCommand(); virtual ~ElementDisplayedCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementDisplayedCommand); DISALLOW_COPY_AND_ASSIGN(ElementDisplayedCommand);
...@@ -110,8 +110,8 @@ class ElementEnabledCommand : public WebElementCommand { ...@@ -110,8 +110,8 @@ class ElementEnabledCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementEnabledCommand(); virtual ~ElementEnabledCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementEnabledCommand); DISALLOW_COPY_AND_ASSIGN(ElementEnabledCommand);
...@@ -125,8 +125,8 @@ class ElementEqualsCommand : public WebElementCommand { ...@@ -125,8 +125,8 @@ class ElementEqualsCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementEqualsCommand(); virtual ~ElementEqualsCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementEqualsCommand); DISALLOW_COPY_AND_ASSIGN(ElementEqualsCommand);
...@@ -140,8 +140,8 @@ class ElementLocationCommand : public WebElementCommand { ...@@ -140,8 +140,8 @@ class ElementLocationCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementLocationCommand(); virtual ~ElementLocationCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementLocationCommand); DISALLOW_COPY_AND_ASSIGN(ElementLocationCommand);
...@@ -156,8 +156,8 @@ class ElementLocationInViewCommand : public WebElementCommand { ...@@ -156,8 +156,8 @@ class ElementLocationInViewCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementLocationInViewCommand(); virtual ~ElementLocationInViewCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementLocationInViewCommand); DISALLOW_COPY_AND_ASSIGN(ElementLocationInViewCommand);
...@@ -171,8 +171,8 @@ class ElementNameCommand : public WebElementCommand { ...@@ -171,8 +171,8 @@ class ElementNameCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementNameCommand(); virtual ~ElementNameCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementNameCommand); DISALLOW_COPY_AND_ASSIGN(ElementNameCommand);
...@@ -187,10 +187,10 @@ class ElementSelectedCommand : public WebElementCommand { ...@@ -187,10 +187,10 @@ class ElementSelectedCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementSelectedCommand(); virtual ~ElementSelectedCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementSelectedCommand); DISALLOW_COPY_AND_ASSIGN(ElementSelectedCommand);
...@@ -204,8 +204,8 @@ class ElementSizeCommand : public WebElementCommand { ...@@ -204,8 +204,8 @@ class ElementSizeCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementSizeCommand(); virtual ~ElementSizeCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementSizeCommand); DISALLOW_COPY_AND_ASSIGN(ElementSizeCommand);
...@@ -219,8 +219,8 @@ class ElementSubmitCommand : public WebElementCommand { ...@@ -219,8 +219,8 @@ class ElementSubmitCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementSubmitCommand(); virtual ~ElementSubmitCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementSubmitCommand); DISALLOW_COPY_AND_ASSIGN(ElementSubmitCommand);
...@@ -234,8 +234,8 @@ class ElementToggleCommand : public WebElementCommand { ...@@ -234,8 +234,8 @@ class ElementToggleCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementToggleCommand(); virtual ~ElementToggleCommand();
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementToggleCommand); DISALLOW_COPY_AND_ASSIGN(ElementToggleCommand);
...@@ -250,10 +250,10 @@ class ElementValueCommand : public WebElementCommand { ...@@ -250,10 +250,10 @@ class ElementValueCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementValueCommand(); virtual ~ElementValueCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual bool DoesPost(); virtual bool DoesPost() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
virtual void ExecutePost(Response* const response); virtual void ExecutePost(Response* const response) OVERRIDE;
private: private:
// Returns whether the element has a given attribute pair. // Returns whether the element has a given attribute pair.
...@@ -274,8 +274,8 @@ class ElementTextCommand : public WebElementCommand { ...@@ -274,8 +274,8 @@ class ElementTextCommand : public WebElementCommand {
base::DictionaryValue* parameters); base::DictionaryValue* parameters);
virtual ~ElementTextCommand(); virtual ~ElementTextCommand();
virtual bool DoesGet(); virtual bool DoesGet() OVERRIDE;
virtual void ExecuteGet(Response* const response); virtual void ExecuteGet(Response* const response) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ElementTextCommand); DISALLOW_COPY_AND_ASSIGN(ElementTextCommand);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment