Chromium Code Reviews| Index: components/translate/ios/browser/translate_controller.h |
| diff --git a/components/translate/ios/browser/translate_controller.h b/components/translate/ios/browser/translate_controller.h |
| index 6cf848e9ace599c89913e16a5a9392847edbb655..02f77461b094602d5fff5d5c8db9409b88945c74 100644 |
| --- a/components/translate/ios/browser/translate_controller.h |
| +++ b/components/translate/ios/browser/translate_controller.h |
| @@ -8,12 +8,11 @@ |
| #include <string> |
| #include "base/gtest_prod_util.h" |
| -#include "base/mac/scoped_nsobject.h" |
| #include "base/macros.h" |
| #include "base/memory/weak_ptr.h" |
| +#import "components/translate/ios/browser/js_translate_manager.h" |
|
noyau (Ping after 24h)
2017/01/19 14:35:26
I believe this include is not needed, the @class s
stkhapugin
2017/01/19 14:47:59
Done.
|
| #include "ios/web/public/web_state/web_state_observer.h" |
| -@class JsTranslateManager; |
| class GURL; |
| namespace base { |
| @@ -69,7 +68,7 @@ class TranslateController : public web::WebStateObserver { |
| // Changes the JsTranslateManager used by this TranslateController. |
| // Only used for testing. |
| void SetJsTranslateManagerForTesting(JsTranslateManager* manager) { |
| - js_manager_.reset([manager retain]); |
| + js_manager_ = manager; |
| } |
| private: |
| @@ -95,7 +94,7 @@ class TranslateController : public web::WebStateObserver { |
| void WebStateDestroyed() override; |
| Observer* observer_; |
| - base::scoped_nsobject<JsTranslateManager> js_manager_; |
| + JsTranslateManager* js_manager_; |
| base::WeakPtrFactory<TranslateController> weak_method_factory_; |
| DISALLOW_COPY_AND_ASSIGN(TranslateController); |