summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/chromeos/chrome_browser_main_chromeos.cc2
-rw-r--r--chrome/browser/chromeos/extensions/power/power_api_manager.cc2
-rw-r--r--chrome/chrome_browser_chromeos.gypi2
-rw-r--r--chrome/chrome_tests.gypi1
-rw-r--r--chromeos/chromeos.gyp45
-rw-r--r--chromeos/power/power_state_override.cc (renamed from chrome/browser/chromeos/power/power_state_override.cc)4
-rw-r--r--chromeos/power/power_state_override.h (renamed from chrome/browser/chromeos/power/power_state_override.h)9
-rw-r--r--chromeos/power/power_state_override_unittest.cc (renamed from chrome/browser/chromeos/power/power_state_override_unittest.cc)2
8 files changed, 33 insertions, 34 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index ab6a1ed..6cec438 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -45,7 +45,6 @@
#include "chrome/browser/chromeos/power/output_observer.h"
#include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h"
#include "chrome/browser/chromeos/power/power_button_observer.h"
-#include "chrome/browser/chromeos/power/power_state_override.h"
#include "chrome/browser/chromeos/power/resume_observer.h"
#include "chrome/browser/chromeos/power/screen_dimming_observer.h"
#include "chrome/browser/chromeos/power/screen_lock_observer.h"
@@ -79,6 +78,7 @@
#include "chromeos/dbus/session_manager_client.h"
#include "chromeos/disks/disk_mount_manager.h"
#include "chromeos/display/output_configurator.h"
+#include "chromeos/power/power_state_override.h"
#include "content/public/browser/notification_service.h"
#include "content/public/common/main_function_params.h"
#include "grit/platform_locale_settings.h"
diff --git a/chrome/browser/chromeos/extensions/power/power_api_manager.cc b/chrome/browser/chromeos/extensions/power/power_api_manager.cc
index b3622e4..e053b02 100644
--- a/chrome/browser/chromeos/extensions/power/power_api_manager.cc
+++ b/chrome/browser/chromeos/extensions/power/power_api_manager.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/chromeos/extensions/power/power_api_manager.h"
-#include "chrome/browser/chromeos/power/power_state_override.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/extension.h"
+#include "chromeos/power/power_state_override.h"
#include "content/public/browser/notification_service.h"
namespace extensions {
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 0755f88..5c6c1b4 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -525,8 +525,6 @@
'browser/chromeos/power/power_button_controller_delegate_chromeos.h',
'browser/chromeos/power/power_button_observer.cc',
'browser/chromeos/power/power_button_observer.h',
- 'browser/chromeos/power/power_state_override.cc',
- 'browser/chromeos/power/power_state_override.h',
'browser/chromeos/power/resume_observer.cc',
'browser/chromeos/power/resume_observer.h',
'browser/chromeos/power/screen_dimming_observer.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index c1c28ed..773b7f1 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1172,7 +1172,6 @@
'browser/chromeos/network_message_observer_unittest.cc',
'browser/chromeos/offline/offline_load_page_unittest.cc',
'browser/chromeos/oom_priority_manager_unittest.cc',
- 'browser/chromeos/power/power_state_override_unittest.cc',
'browser/chromeos/preferences_unittest.cc',
'browser/chromeos/process_proxy/process_output_watcher_unittest.cc',
'browser/chromeos/proxy_config_service_impl_unittest.cc',
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 48014f4..dbecc2b 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -124,6 +124,8 @@
'display/output_configurator.h',
'network/network_sms_handler.cc',
'network/network_sms_handler.h',
+ 'power/power_state_override.cc',
+ 'power/power_state_override.h',
],
'link_settings': {
'libraries': [
@@ -209,27 +211,27 @@
],
},
{
- 'target_name': 'chromeos_test_support_without_gmock',
- 'type': 'static_library',
- 'dependencies': [
- '../build/linux/system.gyp:dbus',
- 'chromeos',
- ],
- 'sources': [
- 'dbus/mock_dbus_thread_manager_without_gmock.cc',
- 'dbus/mock_dbus_thread_manager_without_gmock.h',
- 'dbus/ibus/mock_ibus_client.cc',
- 'dbus/ibus/mock_ibus_client.h',
- 'dbus/ibus/mock_ibus_input_context_client.cc',
- 'dbus/ibus/mock_ibus_input_context_client.h',
- 'dbus/ibus/mock_ibus_engine_factory_service.cc',
- 'dbus/ibus/mock_ibus_engine_factory_service.h',
- 'dbus/ibus/mock_ibus_engine_service.cc',
- 'dbus/ibus/mock_ibus_engine_service.h',
- ],
- 'include_dirs': [
- '..',
- ],
+ 'target_name': 'chromeos_test_support_without_gmock',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../build/linux/system.gyp:dbus',
+ 'chromeos',
+ ],
+ 'sources': [
+ 'dbus/mock_dbus_thread_manager_without_gmock.cc',
+ 'dbus/mock_dbus_thread_manager_without_gmock.h',
+ 'dbus/ibus/mock_ibus_client.cc',
+ 'dbus/ibus/mock_ibus_client.h',
+ 'dbus/ibus/mock_ibus_input_context_client.cc',
+ 'dbus/ibus/mock_ibus_input_context_client.h',
+ 'dbus/ibus/mock_ibus_engine_factory_service.cc',
+ 'dbus/ibus/mock_ibus_engine_factory_service.h',
+ 'dbus/ibus/mock_ibus_engine_service.cc',
+ 'dbus/ibus/mock_ibus_engine_service.h',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
},
{
'target_name': 'chromeos_unittests',
@@ -267,6 +269,7 @@
'dbus/introspectable_client_unittest.cc',
'dbus/modem_messaging_client_unittest.cc',
'network/network_sms_handler_unittest.cc',
+ 'power/power_state_override_unittest.cc',
],
'include_dirs': [
'..',
diff --git a/chrome/browser/chromeos/power/power_state_override.cc b/chromeos/power/power_state_override.cc
index 417bfcd..20582ca 100644
--- a/chrome/browser/chromeos/power/power_state_override.cc
+++ b/chromeos/power/power_state_override.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/power/power_state_override.h"
+#include "chromeos/power/power_state_override.h"
#include "base/bind.h"
#include "base/message_loop.h"
@@ -10,8 +10,6 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager_client.h"
-using chromeos::PowerManagerClient;
-
namespace {
// Frequency with which overrides are renewed.
diff --git a/chrome/browser/chromeos/power/power_state_override.h b/chromeos/power/power_state_override.h
index 184b003..4e2fab9 100644
--- a/chrome/browser/chromeos/power/power_state_override.h
+++ b/chromeos/power/power_state_override.h
@@ -2,18 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_POWER_POWER_STATE_OVERRIDE_H_
-#define CHROME_BROWSER_CHROMEOS_POWER_POWER_STATE_OVERRIDE_H_
+#ifndef CHROMEOS_POWER_POWER_STATE_OVERRIDE_H_
+#define CHROMEOS_POWER_POWER_STATE_OVERRIDE_H_
#include "base/basictypes.h"
#include "base/memory/weak_ptr.h"
#include "base/timer.h"
+#include "chromeos/chromeos_export.h"
namespace chromeos {
// This class overrides the current power state on the machine, disabling
// a set of power management features.
-class PowerStateOverride {
+class CHROMEOS_EXPORT PowerStateOverride {
public:
enum Mode {
// Blocks the screen from being dimmed or blanked due to user inactivity.
@@ -55,4 +56,4 @@ class PowerStateOverride {
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_POWER_POWER_STATE_OVERRIDE_H_
+#endif // CHROMEOS_POWER_POWER_STATE_OVERRIDE_H_
diff --git a/chrome/browser/chromeos/power/power_state_override_unittest.cc b/chromeos/power/power_state_override_unittest.cc
index c09ff3a..3deaab9 100644
--- a/chrome/browser/chromeos/power/power_state_override_unittest.cc
+++ b/chromeos/power/power_state_override_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/power/power_state_override.h"
+#include "chromeos/power/power_state_override.h"
#include "base/message_loop.h"
#include "chromeos/dbus/mock_power_manager_client.h"
generated by cgit v1.1 at 2025-02-01 03:11:28 +0000