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

Side by Side Diff: ios/chrome/browser/translate/chrome_ios_translate_client.mm

Issue 1861593005: Convert //ios 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 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/translate/chrome_ios_translate_client.h" 5 #include "ios/chrome/browser/translate/chrome_ios_translate_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 28 matching lines...) Expand all
39 translate_manager_( 39 translate_manager_(
40 new translate::TranslateManager(this, prefs::kAcceptLanguages)), 40 new translate::TranslateManager(this, prefs::kAcceptLanguages)),
41 translate_driver_(web_state, 41 translate_driver_(web_state,
42 web_state->GetNavigationManager(), 42 web_state->GetNavigationManager(),
43 translate_manager_.get()) {} 43 translate_manager_.get()) {}
44 44
45 ChromeIOSTranslateClient::~ChromeIOSTranslateClient() { 45 ChromeIOSTranslateClient::~ChromeIOSTranslateClient() {
46 } 46 }
47 47
48 // static 48 // static
49 scoped_ptr<translate::TranslatePrefs> 49 std::unique_ptr<translate::TranslatePrefs>
50 ChromeIOSTranslateClient::CreateTranslatePrefs(PrefService* prefs) { 50 ChromeIOSTranslateClient::CreateTranslatePrefs(PrefService* prefs) {
51 return scoped_ptr<translate::TranslatePrefs>( 51 return std::unique_ptr<translate::TranslatePrefs>(
52 new translate::TranslatePrefs(prefs, prefs::kAcceptLanguages, nullptr)); 52 new translate::TranslatePrefs(prefs, prefs::kAcceptLanguages, nullptr));
53 } 53 }
54 54
55 translate::TranslateManager* ChromeIOSTranslateClient::GetTranslateManager() { 55 translate::TranslateManager* ChromeIOSTranslateClient::GetTranslateManager() {
56 return translate_manager_.get(); 56 return translate_manager_.get();
57 } 57 }
58 58
59 // TranslateClient implementation: 59 // TranslateClient implementation:
60 60
61 scoped_ptr<infobars::InfoBar> ChromeIOSTranslateClient::CreateInfoBar( 61 std::unique_ptr<infobars::InfoBar> ChromeIOSTranslateClient::CreateInfoBar(
62 scoped_ptr<translate::TranslateInfoBarDelegate> delegate) const { 62 std::unique_ptr<translate::TranslateInfoBarDelegate> delegate) const {
63 translate::TranslateStep step = delegate->translate_step(); 63 translate::TranslateStep step = delegate->translate_step();
64 64
65 scoped_ptr<InfoBarIOS> infobar(new InfoBarIOS(std::move(delegate))); 65 std::unique_ptr<InfoBarIOS> infobar(new InfoBarIOS(std::move(delegate)));
66 base::scoped_nsobject<InfoBarController> controller; 66 base::scoped_nsobject<InfoBarController> controller;
67 switch (step) { 67 switch (step) {
68 case translate::TRANSLATE_STEP_AFTER_TRANSLATE: 68 case translate::TRANSLATE_STEP_AFTER_TRANSLATE:
69 controller.reset([[AfterTranslateInfoBarController alloc] 69 controller.reset([[AfterTranslateInfoBarController alloc]
70 initWithDelegate:infobar.get()]); 70 initWithDelegate:infobar.get()]);
71 break; 71 break;
72 case translate::TRANSLATE_STEP_BEFORE_TRANSLATE: 72 case translate::TRANSLATE_STEP_BEFORE_TRANSLATE:
73 controller.reset([[BeforeTranslateInfoBarController alloc] 73 controller.reset([[BeforeTranslateInfoBarController alloc]
74 initWithDelegate:infobar.get()]); 74 initWithDelegate:infobar.get()]);
75 break; 75 break;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 return &translate_driver_; 112 return &translate_driver_;
113 } 113 }
114 114
115 PrefService* ChromeIOSTranslateClient::GetPrefs() { 115 PrefService* ChromeIOSTranslateClient::GetPrefs() {
116 DCHECK(web_state()); 116 DCHECK(web_state());
117 ios::ChromeBrowserState* chrome_browser_state = 117 ios::ChromeBrowserState* chrome_browser_state =
118 ios::ChromeBrowserState::FromBrowserState(web_state()->GetBrowserState()); 118 ios::ChromeBrowserState::FromBrowserState(web_state()->GetBrowserState());
119 return chrome_browser_state->GetOriginalChromeBrowserState()->GetPrefs(); 119 return chrome_browser_state->GetOriginalChromeBrowserState()->GetPrefs();
120 } 120 }
121 121
122 scoped_ptr<translate::TranslatePrefs> 122 std::unique_ptr<translate::TranslatePrefs>
123 ChromeIOSTranslateClient::GetTranslatePrefs() { 123 ChromeIOSTranslateClient::GetTranslatePrefs() {
124 DCHECK(web_state()); 124 DCHECK(web_state());
125 ios::ChromeBrowserState* chrome_browser_state = 125 ios::ChromeBrowserState* chrome_browser_state =
126 ios::ChromeBrowserState::FromBrowserState(web_state()->GetBrowserState()); 126 ios::ChromeBrowserState::FromBrowserState(web_state()->GetBrowserState());
127 return CreateTranslatePrefs(chrome_browser_state->GetPrefs()); 127 return CreateTranslatePrefs(chrome_browser_state->GetPrefs());
128 } 128 }
129 129
130 translate::TranslateAcceptLanguages* 130 translate::TranslateAcceptLanguages*
131 ChromeIOSTranslateClient::GetTranslateAcceptLanguages() { 131 ChromeIOSTranslateClient::GetTranslateAcceptLanguages() {
132 DCHECK(web_state()); 132 DCHECK(web_state());
(...skipping 14 matching lines...) Expand all
147 const GURL& report_url) { 147 const GURL& report_url) {
148 NOTREACHED(); 148 NOTREACHED();
149 } 149 }
150 150
151 void ChromeIOSTranslateClient::WebStateDestroyed() { 151 void ChromeIOSTranslateClient::WebStateDestroyed() {
152 // Translation process can be interrupted. 152 // Translation process can be interrupted.
153 // Destroying the TranslateManager now guarantees that it never has to deal 153 // Destroying the TranslateManager now guarantees that it never has to deal
154 // with nullptr WebState. 154 // with nullptr WebState.
155 translate_manager_.reset(); 155 translate_manager_.reset();
156 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698