diff options
| author | oritm@chromium.org <oritm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 21:45:37 +0000 |
|---|---|---|
| committer | oritm@chromium.org <oritm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 21:45:37 +0000 |
| commit | 79c8cf788fd6804fdef365af326d4ec1a11e6eb0 (patch) | |
| tree | b5241a3f763be55d15cf4f5fd113497112748b29 | |
| parent | 00d801524b66f6ccccb8ce0d4ce72de2f39c744c (diff) | |
| download | chromium_src-79c8cf788fd6804fdef365af326d4ec1a11e6eb0.zip chromium_src-79c8cf788fd6804fdef365af326d4ec1a11e6eb0.tar.gz chromium_src-79c8cf788fd6804fdef365af326d4ec1a11e6eb0.tar.bz2 | |
Merge 112699 - Fix ChromeOS clang build after original change was reverted.
TBR=sque@chromium.org
Review URL: http://codereview.chromium.org/8769035
TBR=joaodasilva@chromium.org
Review URL: http://codereview.chromium.org/8772057
git-svn-id: svn://svn.chromium.org/chrome/branches/958/src@112796 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider.h | 2 | ||||
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider_chromeos.cc | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h index af26568..18be8a8 100644 --- a/chrome/browser/automation/testing_automation_provider.h +++ b/chrome/browser/automation/testing_automation_provider.h @@ -1344,8 +1344,6 @@ class TestingAutomationProvider : public AutomationProvider, // chromeos::PowerManagerClient::Observer overrides. virtual void PowerChanged(const chromeos::PowerSupplyStatus& status) OVERRIDE; - virtual void LockScreen() OVERRIDE; - virtual void UnlockScreen() OVERRIDE; #endif // defined(OS_CHROMEOS) diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc index b4d65dc..b339228 100644 --- a/chrome/browser/automation/testing_automation_provider_chromeos.cc +++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc @@ -1128,11 +1128,3 @@ void TestingAutomationProvider::PowerChanged( const chromeos::PowerSupplyStatus& status) { power_status = status; } - -void TestingAutomationProvider::LockScreen() { - // Not used, but defined to make clang happy with the overloaded name. -} - -void TestingAutomationProvider::UnlockScreen() { - // Not used, but defined to make clang happy with the overloaded name. -} |