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

Unified Diff: base/power_monitor/power_monitor_mac.mm

Issue 10959020: SystemMonitor refactoring: move power state monitor into a separate class called PowerMonitor (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Use PowerMonitor instead of SystemMonitor in XXXMain function Created 7 years, 9 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
Index: base/power_monitor/power_monitor_mac.mm
diff --git a/base/system_monitor/system_monitor_mac.mm b/base/power_monitor/power_monitor_mac.mm
similarity index 78%
rename from base/system_monitor/system_monitor_mac.mm
rename to base/power_monitor/power_monitor_mac.mm
index d0dbaabcd4417864b21166e81c068e20c769cbe6..07713c805e13c20ff3262d8fd1e8a95344039697 100644
--- a/base/system_monitor/system_monitor_mac.mm
+++ b/base/power_monitor/power_monitor_mac.mm
@@ -1,17 +1,23 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
// Implementation based on sample code from
// http://developer.apple.com/library/mac/#qa/qa1340/_index.html.
-#include "base/system_monitor/system_monitor.h"
+#include "base/power_monitor/power_monitor.h"
#include <IOKit/pwr_mgt/IOPMLib.h>
#include <IOKit/IOMessage.h>
namespace base {
+void ProcessPowerEventHelper(PowerMonitor::PowerEvent event) {
+ DCHECK(PowerMonitor::Get());
+ if (PowerMonitor::Get())
+ PowerMonitor::Get()->ProcessPowerEvent(event);
+}
+
namespace {
io_connect_t g_system_power_io_port = 0;
@@ -22,17 +28,15 @@ void SystemPowerEventCallback(void*,
io_service_t service,
natural_t message_type,
void* message_argument) {
- SystemMonitor* sys_monitor = SystemMonitor::Get();
- DCHECK(sys_monitor);
switch (message_type) {
case kIOMessageSystemWillSleep:
- sys_monitor->ProcessPowerMessage(SystemMonitor::SUSPEND_EVENT);
+ ProcessPowerEventHelper(base::PowerMonitor::SUSPEND_EVENT);
IOAllowPowerChange(g_system_power_io_port,
reinterpret_cast<intptr_t>(message_argument));
break;
case kIOMessageSystemWillPowerOn:
- sys_monitor->ProcessPowerMessage(SystemMonitor::RESUME_EVENT);
+ ProcessPowerEventHelper(PowerMonitor::RESUME_EVENT);
break;
}
}
@@ -45,8 +49,10 @@ void SystemPowerEventCallback(void*,
// See crbug.com/83783 .
// static
-void SystemMonitor::AllocateSystemIOPorts() {
+void PowerMonitor::AllocateSystemIOPorts() {
DCHECK_EQ(g_system_power_io_port, 0u);
+ if (g_system_power_io_port != 0u)
+ return;
// Notification port allocated by IORegisterForSystemPower.
@@ -57,12 +63,10 @@ void SystemMonitor::AllocateSystemIOPorts() {
DCHECK_NE(g_system_power_io_port, 0u);
}
-void SystemMonitor::PlatformInit() {
- // Need to call AllocateSystemIOPorts() before constructing a SystemMonitor
+void PowerMonitor::PlatformInit() {
+ // Need to call AllocateSystemIOPorts() before creating a PowerMonitor
// object.
- DCHECK_NE(g_system_power_io_port, 0u);
- if (g_system_power_io_port == 0)
vandebo (ex-Chrome) 2013/03/19 23:36:04 Why did you move this to AllocateSystemIOPorts? H
Hongbo Min 2013/03/20 13:01:50 Recover it now.
- return;
+ CHECK_NE(g_system_power_io_port, 0u);
// Add the notification port to the application runloop
CFRunLoopAddSource(
@@ -71,8 +75,10 @@ void SystemMonitor::PlatformInit() {
kCFRunLoopCommonModes);
}
-void SystemMonitor::PlatformDestroy() {
+
vandebo (ex-Chrome) 2013/03/19 23:36:04 remove extra line
Hongbo Min 2013/03/20 13:01:50 Done.
+void PowerMonitor::PlatformDestroy() {
DCHECK_NE(g_system_power_io_port, 0u);
+
vandebo (ex-Chrome) 2013/03/19 23:36:04 remove extra line
Hongbo Min 2013/03/20 13:01:50 Done.
if (g_system_power_io_port == 0)
return;

Powered by Google App Engine
This is Rietveld 408576698