| Index: chrome/browser/automation/testing_automation_provider.h
|
| diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h
|
| index 4165c259f6e137aecc904a27f7b481c5d9558015..8d876654eb7f9a4c809e88cbd77a70802b23fbb7 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.h
|
| +++ b/chrome/browser/automation/testing_automation_provider.h
|
| @@ -13,6 +13,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/automation/automation_provider.h"
|
| #include "chrome/browser/automation/automation_provider_json.h"
|
| +#include "chrome/browser/chromeos/cros/power_library.h"
|
| #include "chrome/browser/history/history.h"
|
| #include "chrome/browser/importer/importer_list_observer.h"
|
| #include "chrome/browser/sync/profile_sync_service_harness.h"
|
| @@ -20,6 +21,7 @@
|
| #include "content/common/notification_registrar.h"
|
| #include "content/public/common/page_type.h"
|
| #include "net/base/cert_status_flags.h"
|
| +#include "third_party/cros/chromeos_power.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
|
|
|
| class ImporterList;
|
| @@ -37,7 +39,8 @@ struct WebPluginInfo;
|
| class TestingAutomationProvider : public AutomationProvider,
|
| public BrowserList::Observer,
|
| public importer::ImporterListObserver,
|
| - public NotificationObserver {
|
| + public NotificationObserver,
|
| + public chromeos::PowerLibrary::Observer {
|
| public:
|
| explicit TestingAutomationProvider(Profile* profile);
|
|
|
| @@ -47,6 +50,9 @@ class TestingAutomationProvider : public AutomationProvider,
|
| virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
|
| virtual void OnChannelError() OVERRIDE;
|
|
|
| + virtual void PowerChanged(const chromeos::PowerStatus& status) OVERRIDE;
|
| + virtual void SystemResumed() OVERRIDE {}
|
| +
|
| private:
|
| class PopupMenuWaiter;
|
|
|
| @@ -1410,6 +1416,9 @@ class TestingAutomationProvider : public AutomationProvider,
|
| // The stored data for the ImportSettings operation.
|
| ImportSettingsData import_settings_data_;
|
|
|
| + // Last reported power status.
|
| + chromeos::PowerStatus power_status_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(TestingAutomationProvider);
|
| };
|
|
|
|
|