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

Side by Side Diff: WebCore/platform/chromium/GeolocationServiceChromium.cpp

Issue 3316011: Merge 66886 - 2010-09-07 Jonathan Dixon <joth@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 3 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 /* 1 /*
2 * Copyright (c) 2010, Google Inc. All rights reserved. 2 * Copyright (c) 2010, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "GeolocationServiceChromium.h" 32 #include "GeolocationServiceChromium.h"
33 33
34 #include "ChromiumBridge.h" 34 #include "ChromiumBridge.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 GeolocationServiceBridge::~GeolocationServiceBridge()
39 {
40 }
41
38 GeolocationServiceChromium::GeolocationServiceChromium(GeolocationServiceClient* c) 42 GeolocationServiceChromium::GeolocationServiceChromium(GeolocationServiceClient* c)
39 : GeolocationService(c), 43 : GeolocationService(c),
40 m_geolocation(static_cast<Geolocation*>(c)), 44 m_geolocation(static_cast<Geolocation*>(c)),
41 m_geolocationServiceBridge(ChromiumBridge::createGeolocationServiceBri dge(this)), 45 m_geolocationServiceBridge(ChromiumBridge::createGeolocationServiceBri dge(this)),
42 m_lastError(PositionError::create(PositionError::POSITION_UNAVAILABLE, "")) 46 m_lastError(PositionError::create(PositionError::POSITION_UNAVAILABLE, ""))
43 { 47 {
44 } 48 }
45 49
46 void GeolocationServiceChromium::setIsAllowed(bool allowed) 50 void GeolocationServiceChromium::setIsAllowed(bool allowed)
47 { 51 {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 101
98 static GeolocationService* createGeolocationServiceChromium(GeolocationServiceCl ient* c) 102 static GeolocationService* createGeolocationServiceChromium(GeolocationServiceCl ient* c)
99 { 103 {
100 return new GeolocationServiceChromium(c); 104 return new GeolocationServiceChromium(c);
101 } 105 }
102 106
103 // Sets up the factory function for GeolocationService. 107 // Sets up the factory function for GeolocationService.
104 GeolocationService::FactoryFunction* GeolocationService::s_factoryFunction = &cr eateGeolocationServiceChromium; 108 GeolocationService::FactoryFunction* GeolocationService::s_factoryFunction = &cr eateGeolocationServiceChromium;
105 109
106 } // namespace WebCore 110 } // namespace WebCore
OLDNEW
« no previous file with comments | « WebCore/platform/chromium/GeolocationServiceChromium.h ('k') | WebKit/chromium/public/WebGeolocationService.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698