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

Unified Diff: chrome/browser/automation/testing_automation_provider.h

Issue 8347016: chromeos: Simplify power supply info in PowerLibrary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Various comment fixes Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0aab45a81ee5615c60f47a1851c8b748afda5688..79a55c6ebde69f4df6efffc439152c0ec26eac87 100644
--- a/chrome/browser/automation/testing_automation_provider.h
+++ b/chrome/browser/automation/testing_automation_provider.h
@@ -22,6 +22,11 @@
#include "net/base/cert_status_flags.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
+#if defined(OS_CHROMEOS)
+// TODO(sque): move to a ChromeOS-specific class. See crosbug.com/22081.
+#include "chrome/browser/chromeos/cros/power_library.h"
+#endif // defined(OS_CHROMEOS)
+
class ImporterList;
class TemplateURLService;
@@ -37,7 +42,11 @@ struct WebPluginInfo;
class TestingAutomationProvider : public AutomationProvider,
public BrowserList::Observer,
public importer::ImporterListObserver,
+#if defined(OS_CHROMEOS)
+ public chromeos::PowerLibrary::Observer,
+#endif // defined(OS_CHROMEOS)
public content::NotificationObserver {
+
public:
explicit TestingAutomationProvider(Profile* profile);
@@ -1343,6 +1352,10 @@ class TestingAutomationProvider : public AutomationProvider,
void CaptureProfilePhoto(Browser* browser,
DictionaryValue* args,
IPC::Message* reply_message);
+
+ // chromeos::PowerLibrary::Observer overrides.
+ virtual void PowerChanged(const chromeos::PowerSupplyStatus& status) OVERRIDE;
+ virtual void SystemResumed() OVERRIDE {}
#endif // defined(OS_CHROMEOS)
void WaitForTabCountToBecome(int browser_handle,
« no previous file with comments | « no previous file | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698