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

Unified Diff: content/renderer/geolocation_dispatcher.h

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « content/renderer/gamepad_shared_memory_reader.h ('k') | content/renderer/gpu/compositor_dependencies.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/geolocation_dispatcher.h
diff --git a/content/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h
index 71766be04a0d912fc2196bfc483dae16c97cccf1..437c5a8c06ae6407f72f1b5fb68e2cc2d2ef0f1c 100644
--- a/content/renderer/geolocation_dispatcher.h
+++ b/content/renderer/geolocation_dispatcher.h
@@ -5,7 +5,8 @@
#ifndef CONTENT_RENDERER_GEOLOCATION_DISPATCHER_H_
#define CONTENT_RENDERER_GEOLOCATION_DISPATCHER_H_
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "content/public/renderer/render_frame_observer.h"
#include "third_party/WebKit/public/platform/modules/geolocation/geolocation.mojom.h"
#include "third_party/WebKit/public/platform/modules/permissions/permission.mojom.h"
@@ -51,9 +52,9 @@ class GeolocationDispatcher
void OnPermissionSet(int permission_request_id,
blink::mojom::PermissionStatus status);
- scoped_ptr<blink::WebGeolocationController> controller_;
+ std::unique_ptr<blink::WebGeolocationController> controller_;
- scoped_ptr<blink::WebGeolocationPermissionRequestManager>
+ std::unique_ptr<blink::WebGeolocationPermissionRequestManager>
pending_permissions_;
blink::mojom::GeolocationServicePtr geolocation_service_;
bool enable_high_accuracy_;
« no previous file with comments | « content/renderer/gamepad_shared_memory_reader.h ('k') | content/renderer/gpu/compositor_dependencies.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698