Implemented new Translate API for purely Objective-C clients.

ios/web_view/internal/cwv_web_view.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web_view/public/cwv_web_view.h"
 
 #include <memory>
 #include <utility>
 
 #import "base/ios/weak_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "google_apis/google_api_keys.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/referrer.h"
 #include "ios/web/public/reload_type.h"
 #import "ios/web/public/web_state/context_menu_params.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
 #import "ios/web/public/web_state/ui/crw_web_delegate.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "ios/web/public/web_state/web_state_delegate_bridge.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.h"
 #import "ios/web_view/internal/cwv_html_element_internal.h"
 #import "ios/web_view/internal/cwv_navigation_action_internal.h"
 #import "ios/web_view/internal/cwv_web_view_configuration_internal.h"
+#import "ios/web_view/internal/translate/cwv_translation_controller_internal.h"
 #import "ios/web_view/internal/translate/web_view_translate_client.h"
 #include "ios/web_view/internal/web_view_browser_state.h"
 #import "ios/web_view/internal/web_view_java_script_dialog_presenter.h"
 #import "ios/web_view/internal/web_view_web_state_policy_decider.h"
 #import "ios/web_view/public/cwv_navigation_delegate.h"
 #import "ios/web_view/public/cwv_ui_delegate.h"
 #import "ios/web_view/public/cwv_web_view_configuration.h"
 #import "net/base/mac/url_conversions.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
@@ skipping 39 matching lines @@
 @property(nonatomic, readwrite) double estimatedProgress;
 
 @end
 
 static NSString* gUserAgentProduct = nil;
 
 @implementation CWVWebView
 
 @synthesize configuration = _configuration;
 @synthesize navigationDelegate = _navigationDelegate;
-@synthesize translationDelegate = _translationDelegate;
 @synthesize estimatedProgress = _estimatedProgress;
 @synthesize UIDelegate = _UIDelegate;
+@synthesize translationController = _translationController;

[michaeldo, 2017/05/01 18:25:36]

Please move up to sort alphabetically.

[jzw1, 2017/05/08 03:36:27]

Done.

 
 + (NSString*)userAgentProduct {
   return gUserAgentProduct;
 }
 
 + (void)setUserAgentProduct:(NSString*)product {
   gUserAgentProduct = [product copy];
 }
 
 + (void)setGoogleAPIKey:(NSString*)googleAPIKey
@@ skipping 82 matching lines @@
   [_webState->GetJSInjectionReceiver() executeJavaScript:javaScriptString
                                        completionHandler:completionHandler];
 }
 
 - (void)setUIDelegate:(id<CWVUIDelegate>)UIDelegate {
   _UIDelegate = UIDelegate;
 
   _javaScriptDialogPresenter->SetUIDelegate(_UIDelegate);
 }
 
-- (void)setTranslationDelegate:(id<CWVTranslateDelegate>)translationDelegate {
-  _translationDelegate = translationDelegate;
-  ios_web_view::WebViewTranslateClient::FromWebState(_webState.get())
-      ->set_translate_delegate(translationDelegate);
-}
-
 // -----------------------------------------------------------------------
 // WebStateObserver implementation.
 
 - (void)webState:(web::WebState*)webState
     didStartProvisionalNavigationForURL:(const GURL&)URL {
   SEL selector = @selector(webViewDidStartProvisionalNavigation:);
   if ([_navigationDelegate respondsToSelector:selector]) {
     [_navigationDelegate webViewDidStartProvisionalNavigation:self];
   }
 }
@@ skipping 77 matching lines @@
   if ([_UIDelegate respondsToSelector:selector]) {
     [_UIDelegate webViewDidClose:self];
   }
 }
 
 - (web::JavaScriptDialogPresenter*)javaScriptDialogPresenterForWebState:
     (web::WebState*)webState {
   return _javaScriptDialogPresenter.get();
 }
 
+#pragma mark - Translation
+
+- (CWVTranslationController*)translationController {
+  if (!_translationController) {
+    _translationController = [[CWVTranslationController alloc] init];
+    _translationController.webState = _webState.get();
+  }
+  return _translationController;
+}
+
 #pragma mark - Preserving and Restoring State
 
 - (void)encodeRestorableStateWithCoder:(NSCoder*)coder {
   [super encodeRestorableStateWithCoder:coder];
   [coder encodeObject:_webState->BuildSessionStorage()
                forKey:kSessionStorageKey];
 }
 
 - (void)decodeRestorableStateWithCoder:(NSCoder*)coder {
   [super decodeRestorableStateWithCoder:coder];
@@ skipping 31 matching lines @@
   _webState->SetDelegate(_webStateDelegate.get());
 
   _webStatePolicyDecider =
       base::MakeUnique<ios_web_view::WebViewWebStatePolicyDecider>(
           _webState.get(), self);
 
   _javaScriptDialogPresenter =
       base::MakeUnique<ios_web_view::WebViewJavaScriptDialogPresenter>(self,
                                                                        nullptr);
 
-  // Initialize Translate.
-  ios_web_view::WebViewTranslateClient::CreateForWebState(_webState.get());
+  _translationController.webState = _webState.get();
 
   [self addInternalWebViewAsSubview];
 }
 
 // Adds the web view provided by |_webState| as a subview unless it has already.
 - (void)addInternalWebViewAsSubview {
   UIView* subview = _webState->GetView();
   if (subview.superview == self) {
     return;
   }
   subview.frame = self.bounds;
   subview.autoresizingMask =
       UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   [self addSubview:subview];
 }
 
 @end