| Index: Source/modules/device_orientation/DeviceMotionController.h
 | 
| diff --git a/Source/modules/device_orientation/DeviceMotionController.h b/Source/modules/device_orientation/DeviceMotionController.h
 | 
| index 4c7d59c590f9815f4a07b86dddb04247e4d1e112..cdf89d611854b46a96b5e63513f0598582aa4231 100644
 | 
| --- a/Source/modules/device_orientation/DeviceMotionController.h
 | 
| +++ b/Source/modules/device_orientation/DeviceMotionController.h
 | 
| @@ -1,25 +1,29 @@
 | 
|  /*
 | 
| - * Copyright 2010 Apple Inc. All rights reserved.
 | 
| - * Copyright (C) 2012 Samsung Electronics. All rights reserved.
 | 
| + * Copyright (C) 2013 Google Inc. All rights reserved.
 | 
|   *
 | 
|   * Redistribution and use in source and binary forms, with or without
 | 
| - * modification, are permitted provided that the following conditions
 | 
| - * are met:
 | 
| - *  * Redistributions of source code must retain the above copyright
 | 
| - *    notice, this list of conditions and the following disclaimer.
 | 
| - *  * Redistributions in binary form must reproduce the above copyright
 | 
| - *    notice, this list of conditions and the following disclaimer in the
 | 
| - *    documentation and/or other materials provided with the distribution.
 | 
| + * modification, are permitted provided that the following conditions are
 | 
| + * met:
 | 
|   *
 | 
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
 | 
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 | 
| - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 | 
| - * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
 | 
| - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 | 
| - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 | 
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 | 
| - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 | 
| - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 | 
| + *     * Redistributions of source code must retain the above copyright
 | 
| + * notice, this list of conditions and the following disclaimer.
 | 
| + *     * Redistributions in binary form must reproduce the above
 | 
| + * copyright notice, this list of conditions and the following disclaimer
 | 
| + * in the documentation and/or other materials provided with the
 | 
| + * distribution.
 | 
| + *     * Neither the name of Google Inc. nor the names of its
 | 
| + * contributors may be used to endorse or promote products derived from
 | 
| + * this software without specific prior written permission.
 | 
| + *
 | 
| + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 | 
| + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 | 
| + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 | 
| + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 | 
| + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 | 
| + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 | 
| + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 | 
| + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 | 
| + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 | 
|   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 | 
|   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 | 
|   */
 | 
| @@ -28,16 +32,14 @@
 | 
|  #define DeviceMotionController_h
 | 
|  
 | 
|  #include "core/dom/DocumentSupplementable.h"
 | 
| -#include "core/frame/DOMWindowLifecycleObserver.h"
 | 
| -#include "core/frame/DeviceSensorEventController.h"
 | 
| -#include "modules/EventModules.h"
 | 
| +#include "core/frame/DeviceSingleWindowEventController.h"
 | 
|  
 | 
|  namespace WebCore {
 | 
|  
 | 
|  class DeviceMotionData;
 | 
| -class DOMWindow;
 | 
| +class Event;
 | 
|  
 | 
| -class DeviceMotionController FINAL : public NoBaseWillBeGarbageCollectedFinalized<DeviceMotionController>, public DeviceSensorEventController, public DocumentSupplement, public DOMWindowLifecycleObserver {
 | 
| +class DeviceMotionController FINAL : public NoBaseWillBeGarbageCollectedFinalized<DeviceMotionController>, public DeviceSingleWindowEventController, public DocumentSupplement {
 | 
|      WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DeviceMotionController);
 | 
|  public:
 | 
|      virtual ~DeviceMotionController();
 | 
| @@ -45,24 +47,18 @@ public:
 | 
|      static const char* supplementName();
 | 
|      static DeviceMotionController& from(Document&);
 | 
|  
 | 
| -    void didChangeDeviceMotion(DeviceMotionData*);
 | 
| -
 | 
|  private:
 | 
|      explicit DeviceMotionController(Document&);
 | 
| +
 | 
| +    // Inherited from DeviceEventControllerBase.
 | 
|      virtual void registerWithDispatcher() OVERRIDE;
 | 
|      virtual void unregisterWithDispatcher() OVERRIDE;
 | 
| +    virtual bool isInvokeInitialUpdate() OVERRIDE;
 | 
|  
 | 
| -    // Inherited from DOMWindowLifecycleObserver.
 | 
| -    virtual void didAddEventListener(DOMWindow*, const AtomicString&) OVERRIDE;
 | 
| -    virtual void didRemoveEventListener(DOMWindow*, const AtomicString&) OVERRIDE;
 | 
| -    virtual void didRemoveAllEventListeners(DOMWindow*) OVERRIDE;
 | 
| -
 | 
| -    virtual bool hasLastData() OVERRIDE;
 | 
| +    // Inherited from DeviceSingleWindowEventController.
 | 
|      virtual PassRefPtrWillBeRawPtr<Event> getLastEvent() OVERRIDE;
 | 
| +    virtual const AtomicString& getEventTypeName() OVERRIDE;
 | 
|      virtual bool isNullEvent(Event*) OVERRIDE;
 | 
| -    virtual Document* document() OVERRIDE;
 | 
| -
 | 
| -    Document& m_document;
 | 
|  };
 | 
|  
 | 
|  } // namespace WebCore
 | 
| 
 |