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

Unified Diff: content/browser/geolocation/libgps_2_94_wrapper_linux.cc

Issue 6597044: Revert 76228 - Move core pieces of geolocation from chrome to content.This is... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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: content/browser/geolocation/libgps_2_94_wrapper_linux.cc
===================================================================
--- content/browser/geolocation/libgps_2_94_wrapper_linux.cc (revision 76230)
+++ content/browser/geolocation/libgps_2_94_wrapper_linux.cc (working copy)
@@ -1,48 +0,0 @@
-// Copyright (c) 2010 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.
-
-// Defines a variant of libgps wrapper for use with the 2.94 release of the API.
-
-#include "content/browser/geolocation/libgps_wrapper_linux.h"
-
-#include "base/logging.h"
-#include "chrome/common/geoposition.h"
-#include "third_party/gpsd/release-2.94/gps.h"
-
-class LibGpsV294 : public LibGps {
- public:
- explicit LibGpsV294(LibGpsLibraryWrapper* dl_wrapper) : LibGps(dl_wrapper) {}
-
- // LibGps
- virtual bool StartStreaming() {
- return library().stream(WATCH_ENABLE) == 0;
- }
- virtual bool DataWaiting() {
- return library().waiting();
- }
- virtual bool GetPositionIfFixed(Geoposition* position) {
- // This function is duplicated between the library versions, however it
- // cannot be shared as each one must be strictly compiled against the
- // corresponding version of gps.h.
- DCHECK(position);
- const gps_data_t& gps_data = library().data();
- if (gps_data.status == STATUS_NO_FIX)
- return false;
- position->latitude = gps_data.fix.latitude;
- position->longitude = gps_data.fix.longitude;
- position->accuracy = std::max(gps_data.fix.epx, gps_data.fix.epy);
- position->altitude = gps_data.fix.altitude;
- position->altitude_accuracy = gps_data.fix.epv;
- position->heading = gps_data.fix.track;
- position->speed = gps_data.fix.speed;
- return true;
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LibGpsV294);
-};
-
-LibGps* LibGps::NewV294(LibGpsLibraryWrapper* dl_wrapper) {
- return new LibGpsV294(dl_wrapper);
-}
« no previous file with comments | « content/browser/geolocation/libgps_2_38_wrapper_linux.cc ('k') | content/browser/geolocation/libgps_wrapper_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698