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

Unified Diff: chrome/app/android/chrome_main_delegate_android.h

Issue 1899083002: Convert //chrome 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 | « no previous file | chrome/app/chrome_crash_reporter_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/android/chrome_main_delegate_android.h
diff --git a/chrome/app/android/chrome_main_delegate_android.h b/chrome/app/android/chrome_main_delegate_android.h
index 226c086a7ce19663f9742326b8a13171d8be3bda..6e68170e76e1e7316f689dde8f31405145ccbc1f 100644
--- a/chrome/app/android/chrome_main_delegate_android.h
+++ b/chrome/app/android/chrome_main_delegate_android.h
@@ -5,8 +5,9 @@
#ifndef CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_
#define CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/app/chrome_main_delegate.h"
#include "content/public/browser/browser_main_runner.h"
@@ -35,10 +36,11 @@ class ChromeMainDelegateAndroid : public ChromeMainDelegate {
#endif
private:
- scoped_ptr<content::BrowserMainRunner> browser_runner_;
+ std::unique_ptr<content::BrowserMainRunner> browser_runner_;
#if defined(SAFE_BROWSING_DB_REMOTE)
- scoped_ptr<safe_browsing::SafeBrowsingApiHandler> safe_browsing_api_handler_;
+ std::unique_ptr<safe_browsing::SafeBrowsingApiHandler>
+ safe_browsing_api_handler_;
#endif
DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateAndroid);
« no previous file with comments | « no previous file | chrome/app/chrome_crash_reporter_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698