| Index: chrome/browser/geolocation/wifi_data_provider_linux.cc
|
| ===================================================================
|
| --- chrome/browser/geolocation/wifi_data_provider_linux.cc (revision 37395)
|
| +++ chrome/browser/geolocation/wifi_data_provider_linux.cc (working copy)
|
| @@ -1,28 +1,7 @@
|
| -// Copyright 2008, Google Inc.
|
| -//
|
| -// Redistribution and use in source and binary forms, with or without
|
| -// modification, are permitted provided that the following conditions are met:
|
| -//
|
| -// 1. Redistributions of source code must retain the above copyright notice,
|
| -// this list of conditions and the following disclaimer.
|
| -// 2. 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.
|
| -// 3. 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 AUTHOR ``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 AUTHOR 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.
|
| -//
|
| +// 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.
|
| +
|
| // WiFi card drivers for Linux implement the Wireless Extensions interface.
|
| // This interface is part of the Linux kernel.
|
| //
|
| @@ -65,9 +44,8 @@
|
| // TODO(steveblock): Investigate the possibility of the author of Wireless Tools
|
| // releasing libiw under a Gears-compatible license.
|
|
|
| -// TODO(cprince): remove platform-specific #ifdef guards when OS-specific
|
| -// sources (e.g. WIN32_CPPSRCS) are implemented
|
| -#if defined(LINUX) && !defined(OS_MACOSX)
|
| +// TODO(joth): port to chromium
|
| +#if 0
|
|
|
| #include "gears/geolocation/wifi_data_provider_linux.h"
|
|
|
| @@ -276,4 +254,4 @@
|
| access_points);
|
| }
|
|
|
| -#endif // LINUX && !OS_MACOSX
|
| +#endif // 0
|
|
|