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

Side by Side Diff: ios/chrome/browser/infobars/infobar_manager_impl.cc

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ios/chrome/browser/infobars/infobar_manager_impl.h" 5 #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
6 6
7 #include <utility>
8
7 #include "components/infobars/core/confirm_infobar_delegate.h" 9 #include "components/infobars/core/confirm_infobar_delegate.h"
8 #include "components/infobars/core/infobar.h" 10 #include "components/infobars/core/infobar.h"
9 #include "components/infobars/core/infobar_delegate.h" 11 #include "components/infobars/core/infobar_delegate.h"
10 #include "ios/chrome/browser/infobars/infobar_utils.h" 12 #include "ios/chrome/browser/infobars/infobar_utils.h"
11 #include "ios/web/public/load_committed_details.h" 13 #include "ios/web/public/load_committed_details.h"
12 #include "ios/web/public/navigation_item.h" 14 #include "ios/web/public/navigation_item.h"
13 #include "ios/web/public/navigation_manager.h" 15 #include "ios/web/public/navigation_manager.h"
14 #include "ios/web/public/web_state/web_state.h" 16 #include "ios/web/public/web_state/web_state.h"
15 #include "ui/base/page_transition_types.h" 17 #include "ui/base/page_transition_types.h"
16 18
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 57 }
56 58
57 int InfoBarManagerImpl::GetActiveEntryID() { 59 int InfoBarManagerImpl::GetActiveEntryID() {
58 web::NavigationItem* visible_item = 60 web::NavigationItem* visible_item =
59 web_state()->GetNavigationManager()->GetVisibleItem(); 61 web_state()->GetNavigationManager()->GetVisibleItem();
60 return visible_item ? visible_item->GetUniqueID() : 0; 62 return visible_item ? visible_item->GetUniqueID() : 0;
61 } 63 }
62 64
63 scoped_ptr<infobars::InfoBar> InfoBarManagerImpl::CreateConfirmInfoBar( 65 scoped_ptr<infobars::InfoBar> InfoBarManagerImpl::CreateConfirmInfoBar(
64 scoped_ptr<ConfirmInfoBarDelegate> delegate) { 66 scoped_ptr<ConfirmInfoBarDelegate> delegate) {
65 return ::CreateConfirmInfoBar(delegate.Pass()); 67 return ::CreateConfirmInfoBar(std::move(delegate));
66 } 68 }
67 69
68 void InfoBarManagerImpl::NavigationItemCommitted( 70 void InfoBarManagerImpl::NavigationItemCommitted(
69 const web::LoadCommittedDetails& load_details) { 71 const web::LoadCommittedDetails& load_details) {
70 OnNavigation(NavigationDetailsFromLoadCommittedDetails(load_details)); 72 OnNavigation(NavigationDetailsFromLoadCommittedDetails(load_details));
71 } 73 }
72 74
73 void InfoBarManagerImpl::WebStateDestroyed() { 75 void InfoBarManagerImpl::WebStateDestroyed() {
74 // The WebState is going away; be aggressively paranoid and delete this 76 // The WebState is going away; be aggressively paranoid and delete this
75 // InfoBarManagerImpl lest other parts of the system attempt to add infobars 77 // InfoBarManagerImpl lest other parts of the system attempt to add infobars
76 // or use it otherwise during the destruction. 78 // or use it otherwise during the destruction.
77 web_state()->RemoveUserData(UserDataKey()); 79 web_state()->RemoveUserData(UserDataKey());
78 // That was the equivalent of "delete this". This object is now destroyed; 80 // That was the equivalent of "delete this". This object is now destroyed;
79 // returning from this function is the only safe thing to do. 81 // returning from this function is the only safe thing to do.
80 } 82 }
81 83
82 void InfoBarManagerImpl::OpenURL(const GURL& url, 84 void InfoBarManagerImpl::OpenURL(const GURL& url,
83 WindowOpenDisposition disposition) { 85 WindowOpenDisposition disposition) {
84 NOTIMPLEMENTED(); 86 NOTIMPLEMENTED();
85 } 87 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698