Merge Chromium at r12.0.742.93: Initial merge by git

Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6

1 files changed, 1 insertions, 13 deletions

diff --git a/base/message_pump_mac.h b/base/message_pump_mac.h
index b903a1a..08d6b83 100644
--- a/base/message_pump_mac.h
+++ b/base/message_pump_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -34,7 +34,6 @@
 #include "base/message_pump.h"
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <IOKit/IOKitLib.h>
 
 #if !defined(__OBJC__)
 class NSAutoreleasePool;
@@ -142,12 +141,6 @@ class MessagePumpCFRunLoopBase : public MessagePump {
   // the basis of run loops starting and stopping.
   virtual void EnterExitRunLoop(CFRunLoopActivity activity);
 
-  // IOKit power state change notification callback, called when the system
-  // enters and leaves the sleep state.
-  static void PowerStateNotification(void* info, io_service_t service,
-                                     uint32_t message_type,
-                                     void* message_argument);
-
   // The thread's run loop.
   CFRunLoopRef run_loop_;
 
@@ -161,11 +154,6 @@ class MessagePumpCFRunLoopBase : public MessagePump {
   CFRunLoopObserverRef pre_source_observer_;
   CFRunLoopObserverRef enter_exit_observer_;
 
-  // Objects used for power state notification.  See PowerStateNotification.
-  io_connect_t root_power_domain_;
-  IONotificationPortRef power_notification_port_;
-  io_object_t power_notification_object_;
-
   // (weak) Delegate passed as an argument to the innermost Run call.
   Delegate* delegate_;