From 9369f3bb22d4a17faef11d8297b6bb31003f0c27 Mon Sep 17 00:00:00 2001 From: "timvolodine@chromium.org" Date: Fri, 11 Oct 2013 16:17:10 +0000 Subject: Move device_motion_hardware_buffer.h to device_orientation/ subdirectory. The device_motion_hardware_buffer.h should be in the content/common/device_orientation/ subdirectory where all other related files are located. BUG= Review URL: https://codereview.chromium.org/25878002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228196 0039d316-1c4b-4281-b951-d872f2087c98 --- .../device_orientation/data_fetcher_impl_android.h | 2 +- .../device_orientation/data_fetcher_shared_memory.h | 2 +- .../data_fetcher_shared_memory_android.cc | 2 +- .../data_fetcher_shared_memory_base.cc | 2 +- .../data_fetcher_shared_memory_base_unittest.cc | 2 +- .../device_inertial_sensor_browsertest.cc | 2 +- content/common/device_motion_hardware_buffer.h | 19 ------------------- .../device_motion_hardware_buffer.h | 18 ++++++++++++++++++ content/content_common.gypi | 2 +- .../device_motion_event_pump_unittest.cc | 2 +- 10 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 content/common/device_motion_hardware_buffer.h create mode 100644 content/common/device_orientation/device_motion_hardware_buffer.h diff --git a/content/browser/device_orientation/data_fetcher_impl_android.h b/content/browser/device_orientation/data_fetcher_impl_android.h index 35ed1c7..1c98f6f 100644 --- a/content/browser/device_orientation/data_fetcher_impl_android.h +++ b/content/browser/device_orientation/data_fetcher_impl_android.h @@ -10,7 +10,7 @@ #include "base/synchronization/lock.h" #include "content/browser/device_orientation/device_data.h" #include "content/common/content_export.h" -#include "content/common/device_motion_hardware_buffer.h" +#include "content/common/device_orientation/device_motion_hardware_buffer.h" #include "content/common/device_orientation/device_orientation_hardware_buffer.h" template struct DefaultSingletonTraits; diff --git a/content/browser/device_orientation/data_fetcher_shared_memory.h b/content/browser/device_orientation/data_fetcher_shared_memory.h index dad1cb6..8e41961 100644 --- a/content/browser/device_orientation/data_fetcher_shared_memory.h +++ b/content/browser/device_orientation/data_fetcher_shared_memory.h @@ -8,7 +8,7 @@ #include "content/browser/device_orientation/data_fetcher_shared_memory_base.h" #if !defined(OS_ANDROID) -#include "content/common/device_motion_hardware_buffer.h" +#include "content/common/device_orientation/device_motion_hardware_buffer.h" #include "content/common/device_orientation/device_orientation_hardware_buffer.h" #endif diff --git a/content/browser/device_orientation/data_fetcher_shared_memory_android.cc b/content/browser/device_orientation/data_fetcher_shared_memory_android.cc index 3f00c3d..194c0c2 100644 --- a/content/browser/device_orientation/data_fetcher_shared_memory_android.cc +++ b/content/browser/device_orientation/data_fetcher_shared_memory_android.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "content/browser/device_orientation/data_fetcher_impl_android.h" -#include "content/common/device_motion_hardware_buffer.h" +#include "content/common/device_orientation/device_motion_hardware_buffer.h" #include "content/common/device_orientation/device_orientation_hardware_buffer.h" namespace content { diff --git a/content/browser/device_orientation/data_fetcher_shared_memory_base.cc b/content/browser/device_orientation/data_fetcher_shared_memory_base.cc index 429713c..b863600 100644 --- a/content/browser/device_orientation/data_fetcher_shared_memory_base.cc +++ b/content/browser/device_orientation/data_fetcher_shared_memory_base.cc @@ -9,7 +9,7 @@ #include "base/stl_util.h" #include "base/threading/thread.h" #include "base/timer/timer.h" -#include "content/common/device_motion_hardware_buffer.h" +#include "content/common/device_orientation/device_motion_hardware_buffer.h" #include "content/common/device_orientation/device_orientation_hardware_buffer.h" namespace content { diff --git a/content/browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc b/content/browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc index f2028a6..ca0f39b 100644 --- a/content/browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc +++ b/content/browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc @@ -8,7 +8,7 @@ #include "base/process/process_handle.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" -#include "content/common/device_motion_hardware_buffer.h" +#include "content/common/device_orientation/device_motion_hardware_buffer.h" #include "content/common/device_orientation/device_orientation_hardware_buffer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/device_orientation/device_inertial_sensor_browsertest.cc b/content/browser/device_orientation/device_inertial_sensor_browsertest.cc index 352814f..79088b1 100644 --- a/content/browser/device_orientation/device_inertial_sensor_browsertest.cc +++ b/content/browser/device_orientation/device_inertial_sensor_browsertest.cc @@ -6,7 +6,7 @@ #include "base/synchronization/waitable_event.h" #include "content/browser/device_orientation/data_fetcher_shared_memory.h" #include "content/browser/device_orientation/device_inertial_sensor_service.h" -#include "content/common/device_motion_hardware_buffer.h" +#include "content/common/device_orientation/device_motion_hardware_buffer.h" #include "content/common/device_orientation/device_orientation_hardware_buffer.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" diff --git a/content/common/device_motion_hardware_buffer.h b/content/common/device_motion_hardware_buffer.h deleted file mode 100644 index 0ff855a..0000000 --- a/content/common/device_motion_hardware_buffer.h +++ /dev/null @@ -1,19 +0,0 @@ -// 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. - -#ifndef CONTENT_COMMON_DEVICE_MOTION_HARDWARE_BUFFER_H_ -#define CONTENT_COMMON_DEVICE_MOTION_HARDWARE_BUFFER_H_ - -#include "content/common/shared_memory_seqlock_buffer.h" -#include "third_party/WebKit/public/platform/WebDeviceMotionData.h" - -// TODO(timvolodine): move this file to content/common/device_orientation/. -namespace content { - -typedef SharedMemorySeqLockBuffer - DeviceMotionHardwareBuffer; - -} // namespace content - -#endif // CONTENT_COMMON_DEVICE_MOTION_HARDWARE_BUFFER_H_ diff --git a/content/common/device_orientation/device_motion_hardware_buffer.h b/content/common/device_orientation/device_motion_hardware_buffer.h new file mode 100644 index 0000000..335cd69 --- /dev/null +++ b/content/common/device_orientation/device_motion_hardware_buffer.h @@ -0,0 +1,18 @@ +// 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. + +#ifndef CONTENT_COMMON_DEVICE_ORIENTATION_DEVICE_MOTION_HARDWARE_BUFFER_H_ +#define CONTENT_COMMON_DEVICE_ORIENTATION_DEVICE_MOTION_HARDWARE_BUFFER_H_ + +#include "content/common/shared_memory_seqlock_buffer.h" +#include "third_party/WebKit/public/platform/WebDeviceMotionData.h" + +namespace content { + +typedef SharedMemorySeqLockBuffer + DeviceMotionHardwareBuffer; + +} // namespace content + +#endif // CONTENT_COMMON_DEVICE_ORIENTATION_DEVICE_MOTION_HARDWARE_BUFFER_H_ diff --git a/content/content_common.gypi b/content/content_common.gypi index 1524e0a..8cfd22b 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -150,7 +150,7 @@ 'common/cookie_data.h', 'common/database_messages.h', 'common/desktop_notification_messages.h', - 'common/device_motion_hardware_buffer.h', + 'common/device_orientation/device_motion_hardware_buffer.h', 'common/device_orientation/device_motion_messages.h', 'common/device_orientation/device_orientation_hardware_buffer.h', 'common/device_orientation/device_orientation_messages.h', diff --git a/content/renderer/device_orientation/device_motion_event_pump_unittest.cc b/content/renderer/device_orientation/device_motion_event_pump_unittest.cc index 066294b..7ec3e04 100644 --- a/content/renderer/device_orientation/device_motion_event_pump_unittest.cc +++ b/content/renderer/device_orientation/device_motion_event_pump_unittest.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "content/common/device_motion_hardware_buffer.h" +#include "content/common/device_orientation/device_motion_hardware_buffer.h" #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebDeviceMotionListener.h" -- cgit v1.1