Chromium Code Reviews| Index: ios/web_view/internal/translate/web_view_translate_client.h |
| diff --git a/ios/web_view/internal/translate/web_view_translate_client.h b/ios/web_view/internal/translate/web_view_translate_client.h |
| index 9d0816b63be1d96ddcbe9f2ec318606764795855..6b91239484e25f91d18e97170fb0c986e88e12a8 100644 |
| --- a/ios/web_view/internal/translate/web_view_translate_client.h |
| +++ b/ios/web_view/internal/translate/web_view_translate_client.h |
| @@ -15,7 +15,6 @@ |
| #import "components/translate/ios/browser/ios_translate_driver.h" |
| #include "ios/web/public/web_state/web_state_observer.h" |
| #import "ios/web/public/web_state/web_state_user_data.h" |
| -#import "ios/web_view/public/cwv_translate_delegate.h" |
| class PrefService; |
| @@ -29,6 +28,8 @@ namespace web { |
| class WebState; |
| } |
| +@class CWVTranslationController; |
| + |
| namespace ios_web_view { |
| class WebViewTranslateClient |
| @@ -36,10 +37,12 @@ class WebViewTranslateClient |
| public web::WebStateObserver, |
| public web::WebStateUserData<WebViewTranslateClient> { |
| public: |
| - // Sets the delegate passed by the embedder. |
| - // |delegate| is assumed to outlive this WebViewTranslateClient. |
| - void set_translate_delegate(id<CWVTranslateDelegate> delegate) { |
| - delegate_.reset(delegate); |
| + void set_cwv_translation_controller(CWVTranslationController* controller) { |
| + cwv_translation_controller_.reset(controller); |
| + } |
| + |
| + translate::TranslateManager* GetTranslateManager() { |
|
Eugene But (OOO till 7-30)
2017/04/28 03:07:29
Please be consistent with naming style GetTranslat
jzw1
2017/04/28 05:43:36
Done.
|
| + return translate_manager_.get(); |
| } |
| private: |
| @@ -72,8 +75,7 @@ class WebViewTranslateClient |
| std::unique_ptr<translate::TranslateManager> translate_manager_; |
| translate::IOSTranslateDriver translate_driver_; |
| - // Delegate provided by the embedder. |
| - base::WeakNSProtocol<id<CWVTranslateDelegate>> delegate_; |
| + base::WeakNSObject<CWVTranslationController> cwv_translation_controller_; |
|
Eugene But (OOO till 7-30)
2017/04/28 03:07:29
cwv_ prefix is unnecessary
jzw1
2017/04/28 05:43:36
Done.
|
| DISALLOW_COPY_AND_ASSIGN(WebViewTranslateClient); |
| }; |