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

Unified Diff: chrome/browser/ui/views/frame/browser_root_view.cc

Issue 1865213004: Convert //chrome/browser/ui 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/ui/views/frame/browser_root_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc
index 3fe479ddb155075d36ca072f436983ea5c6401a2..3bcb3d43858516a911b2016a78408ffcd6d58e59 100644
--- a/chrome/browser/ui/views/frame/browser_root_view.cc
+++ b/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -63,7 +63,7 @@ bool BrowserRootView::CanDrop(const ui::OSExchangeData& data) {
void BrowserRootView::OnDragEntered(const ui::DropTargetEvent& event) {
if (ShouldForwardToTabStrip(event)) {
forwarding_to_tab_strip_ = true;
- scoped_ptr<ui::DropTargetEvent> mapped_event(
+ std::unique_ptr<ui::DropTargetEvent> mapped_event(
MapEventToTabStrip(event, event.data()));
tabstrip()->OnDragEntered(*mapped_event.get());
}
@@ -71,7 +71,7 @@ void BrowserRootView::OnDragEntered(const ui::DropTargetEvent& event) {
int BrowserRootView::OnDragUpdated(const ui::DropTargetEvent& event) {
if (ShouldForwardToTabStrip(event)) {
- scoped_ptr<ui::DropTargetEvent> mapped_event(
+ std::unique_ptr<ui::DropTargetEvent> mapped_event(
MapEventToTabStrip(event, event.data()));
if (!forwarding_to_tab_strip_) {
tabstrip()->OnDragEntered(*mapped_event.get());
@@ -115,7 +115,7 @@ int BrowserRootView::OnPerformDrop(const ui::DropTargetEvent& event) {
mapped_data.SetURL(url, base::string16());
}
forwarding_to_tab_strip_ = false;
- scoped_ptr<ui::DropTargetEvent> mapped_event(
+ std::unique_ptr<ui::DropTargetEvent> mapped_event(
MapEventToTabStrip(event, mapped_data));
return tabstrip()->OnPerformDrop(*mapped_event);
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698