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

Unified Diff: chrome/browser/geolocation/empty_device_data_provider.h

Issue 543174: Update Gears wifi data providers to Chrome style & APIs.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 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: chrome/browser/geolocation/empty_device_data_provider.h
===================================================================
--- chrome/browser/geolocation/empty_device_data_provider.h (revision 37395)
+++ chrome/browser/geolocation/empty_device_data_provider.h (working copy)
@@ -1,32 +1,11 @@
-// 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.
-#ifndef GEARS_GEOLOCATION_EMPTY_DEVICE_DATA_PROVIDER_H__
-#define GEARS_GEOLOCATION_EMPTY_DEVICE_DATA_PROVIDER_H__
+#ifndef CHROME_BROWSER_GEOLOCATION_EMPTY_DEVICE_DATA_PROVIDER_H_
+#define CHROME_BROWSER_GEOLOCATION_EMPTY_DEVICE_DATA_PROVIDER_H_
-#include "gears/geolocation/device_data_provider.h"
+#include "chrome/browser/geolocation/device_data_provider.h"
// An implementation of DeviceDataProviderImplBase that does not provide any
// data. Used on platforms where a given data type is not available.
@@ -38,6 +17,7 @@
virtual ~EmptyDeviceDataProvider() {}
// DeviceDataProviderImplBase implementation
+ virtual bool StartDataProvider() { return true; }
virtual bool GetData(DataType *data) {
assert(data);
// This is all the data we can get - nothing.
@@ -45,7 +25,7 @@
}
private:
- DISALLOW_EVIL_CONSTRUCTORS(EmptyDeviceDataProvider);
+ DISALLOW_COPY_AND_ASSIGN(EmptyDeviceDataProvider);
};
-#endif // GEARS_GEOLOCATION_EMPTY_DEVICE_DATA_PROVIDER_H__
+#endif // CHROME_BROWSER_GEOLOCATION_EMPTY_DEVICE_DATA_PROVIDER_H_
« no previous file with comments | « chrome/browser/geolocation/device_data_provider.h ('k') | chrome/browser/geolocation/empty_device_data_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698