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

Unified Diff: android_webview/lib/main/aw_main_delegate.h

Issue 1852513003: Convert //android_webview to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git is hard Created 4 years, 9 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: android_webview/lib/main/aw_main_delegate.h
diff --git a/android_webview/lib/main/aw_main_delegate.h b/android_webview/lib/main/aw_main_delegate.h
index 83bb7480dfb29d5d2e14c563ec8cf5a4ce281eb5..833cd99f733ac030bc150646e150029ad31c9ba5 100644
--- a/android_webview/lib/main/aw_main_delegate.h
+++ b/android_webview/lib/main/aw_main_delegate.h
@@ -5,11 +5,12 @@
#ifndef ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
#define ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
+#include <memory>
+
#include "android_webview/browser/jni_dependency_factory.h"
#include "android_webview/common/aw_content_client.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "content/public/app/content_main_delegate.h"
namespace content {
@@ -52,10 +53,10 @@ class AwMainDelegate : public content::ContentMainDelegate,
content::WebContents* web_contents) override;
#endif
- scoped_ptr<content::BrowserMainRunner> browser_runner_;
+ std::unique_ptr<content::BrowserMainRunner> browser_runner_;
AwContentClient content_client_;
- scoped_ptr<AwContentBrowserClient> content_browser_client_;
- scoped_ptr<AwContentRendererClient> content_renderer_client_;
+ std::unique_ptr<AwContentBrowserClient> content_browser_client_;
+ std::unique_ptr<AwContentRendererClient> content_renderer_client_;
DISALLOW_COPY_AND_ASSIGN(AwMainDelegate);
};
« no previous file with comments | « android_webview/lib/aw_browser_dependency_factory_impl.h ('k') | android_webview/lib/main/aw_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698