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

Unified Diff: chrome/browser/chromeos/login/ui/simple_web_view_dialog.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/chromeos/login/ui/simple_web_view_dialog.h
diff --git a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h
index 302c11876209bb4cdb2539c6d86bf292f2ecef51..3e3a7892f3deafb86a328e2f99be7026e3d898bc 100644
--- a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h
+++ b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h
@@ -5,9 +5,10 @@
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_
#define CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_
+#include <memory>
#include <string>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/command_updater_delegate.h"
#include "chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.h"
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
@@ -102,8 +103,8 @@ class SimpleWebViewDialog : public views::ButtonListener,
void UpdateReload(bool is_loading, bool force);
Profile* profile_;
- scoped_ptr<ToolbarModel> toolbar_model_;
- scoped_ptr<CommandUpdater> command_updater_;
+ std::unique_ptr<ToolbarModel> toolbar_model_;
+ std::unique_ptr<CommandUpdater> command_updater_;
// Controls
views::ImageButton* back_;
@@ -113,9 +114,9 @@ class SimpleWebViewDialog : public views::ButtonListener,
views::WebView* web_view_;
// Contains |web_view_| while it isn't owned by the view.
- scoped_ptr<views::WebView> web_view_container_;
+ std::unique_ptr<views::WebView> web_view_container_;
- scoped_ptr<StubBubbleModelDelegate> bubble_model_delegate_;
+ std::unique_ptr<StubBubbleModelDelegate> bubble_model_delegate_;
DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialog);
};

Powered by Google App Engine
This is Rietveld 408576698