chromeos: Simplify power supply info in PowerLibrary

chrome/browser/automation/testing_automation_provider.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_
 #define CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/importer/importer_list_observer.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_type.h"
 #include "net/base/cert_status_flags.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/cros/power_library.h"
+#endif  // defined(OS_CHROMEOS)
+
 class ImporterList;
 class TemplateURLService;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace webkit {
 struct WebPluginInfo;
 }
 
 // This is an automation provider containing testing calls.
 class TestingAutomationProvider : public AutomationProvider,
                                   public BrowserList::Observer,
                                   public importer::ImporterListObserver,
-                                  public content::NotificationObserver {
+                                  public content::NotificationObserver,
+                                  public chromeos::PowerLibrary::Observer {

[satorux1, 2011/10/21 19:36:50]

This needs to be #if defined(OS_CHROMEOS). I'd suggest to have this before
public "content::NotificationObserver", that'll make it a bit simpler.

[Simon Que, 2011/10/21 20:55:31]

Done.

+
  public:
   explicit TestingAutomationProvider(Profile* profile);
 
   virtual IPC::Channel::Mode GetChannelMode(bool use_named_interface);
 
   // IPC::Channel::Listener:
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
+  virtual void PowerChanged(const chromeos::PowerSupplyStatus& status) OVERRIDE;

[satorux1, 2011/10/21 19:36:50]

Add this.

// chromeos::PowerLibrary::Observer overrides.

[Simon Que, 2011/10/21 20:55:31]

Done.

+  virtual void SystemResumed() OVERRIDE {}

[satorux1, 2011/10/21 19:36:50]

Ditto. This needs to be in #if defined(OS_CHROMEOS). Move this to below where
#if defined(OS_CHROMEOS) is already present.

[Simon Que, 2011/10/21 20:55:31]

Done

+
  private:
   class PopupMenuWaiter;
 
   // Storage for ImportSettings() to resume operations after a callback.
   struct ImportSettingsData {
     string16 browser_name;
     int import_items;
     bool first_run;
     Browser* browser;
     IPC::Message* reply_message;
@@ skipping 1343 matching lines @@
   HistoryService::Handle redirect_query_;
 
   content::NotificationRegistrar registrar_;
 
   // Used to enumerate browser profiles.
   scoped_refptr<ImporterList> importer_list_;
 
   // The stored data for the ImportSettings operation.
   ImportSettingsData import_settings_data_;
 
+  // Last reported power status.
+  chromeos::PowerSupplyStatus power_status_;
+
   DISALLOW_COPY_AND_ASSIGN(TestingAutomationProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_