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

Side by Side Diff: content/browser/device_orientation/provider.cc

Issue 10823318: Moves device_orientation to content namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Attempts to fix trybots Created 8 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/device_orientation/provider.h" 5 #include "content/browser/device_orientation/provider.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/device_orientation/data_fetcher.h" 8 #include "content/browser/device_orientation/data_fetcher.h"
9 #include "content/browser/device_orientation/provider_impl.h" 9 #include "content/browser/device_orientation/provider_impl.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
11 11
12 #if defined(OS_MACOSX) 12 #if defined(OS_MACOSX)
13 #include "content/browser/device_orientation/accelerometer_mac.h" 13 #include "content/browser/device_orientation/accelerometer_mac.h"
14 #elif defined(OS_ANDROID) 14 #elif defined(OS_ANDROID)
15 #include "content/browser/device_orientation/data_fetcher_impl_android.h" 15 #include "content/browser/device_orientation/data_fetcher_impl_android.h"
16 #endif 16 #endif
17 17
18 using content::BrowserThread; 18 using content::BrowserThread;
jam 2012/08/15 19:12:46 ditto
19 19
20 namespace device_orientation { 20 namespace content {
21 21
22 Provider* Provider::GetInstance() { 22 Provider* Provider::GetInstance() {
23 if (!instance_) { 23 if (!instance_) {
24 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 24 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
25 ProviderImpl::DataFetcherFactory default_factory = NULL; 25 ProviderImpl::DataFetcherFactory default_factory = NULL;
26 26
27 #if defined(OS_MACOSX) 27 #if defined(OS_MACOSX)
28 default_factory = AccelerometerMac::Create; 28 default_factory = AccelerometerMac::Create;
29 #elif defined(OS_ANDROID) 29 #elif defined(OS_ANDROID)
30 default_factory = DataFetcherImplAndroid::Create; 30 default_factory = DataFetcherImplAndroid::Create;
(...skipping 16 matching lines...) Expand all
47 Provider::Provider() { 47 Provider::Provider() {
48 } 48 }
49 49
50 Provider::~Provider() { 50 Provider::~Provider() {
51 DCHECK(instance_ == this); 51 DCHECK(instance_ == this);
52 instance_ = NULL; 52 instance_ = NULL;
53 } 53 }
54 54
55 Provider* Provider::instance_ = NULL; 55 Provider* Provider::instance_ = NULL;
56 56
57 } // namespace device_orientation 57 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698