Implemented new Translate API for purely Objective-C clients.

ios/web_view/internal/translate/web_view_translate_client.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/internal/translate/web_view_translate_client.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "components/infobars/core/infobar.h"
 #include "components/prefs/pref_service.h"
 #include "components/translate/core/browser/page_translated_details.h"
 #include "components/translate/core/browser/translate_accept_languages.h"
 #include "components/translate/core/browser/translate_infobar_delegate.h"
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/browser/translate_prefs.h"
 #include "components/translate/core/browser/translate_step.h"
 #include "ios/web/public/browser_state.h"
 #import "ios/web/public/web_state/web_state.h"
 #include "ios/web_view/internal/pref_names.h"
-#import "ios/web_view/internal/translate/cwv_translate_manager_impl.h"
+#import "ios/web_view/internal/translate/cwv_translation_controller_internal.h"
 #include "ios/web_view/internal/translate/web_view_translate_accept_languages_factory.h"
 #include "ios/web_view/internal/translate/web_view_translate_ranker_factory.h"
 #include "ios/web_view/internal/web_view_browser_state.h"
-#import "ios/web_view/public/cwv_translate_delegate.h"
 #include "url/gurl.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 DEFINE_WEB_STATE_USER_DATA_KEY(ios_web_view::WebViewTranslateClient);
 
 namespace ios_web_view {
 
@@ skipping 18 matching lines @@
   NOTREACHED();
   return nullptr;
 }
 
 void WebViewTranslateClient::ShowTranslateUI(
     translate::TranslateStep step,
     const std::string& source_language,
     const std::string& target_language,
     translate::TranslateErrors::Type error_type,
     bool triggered_from_menu) {
-  if (!delegate_.get())
-    return;
-
-  if (error_type != translate::TranslateErrors::NONE)
-    step = translate::TRANSLATE_STEP_TRANSLATE_ERROR;
-
   translate_manager_->GetLanguageState().SetTranslateEnabled(true);
 
   if (step == translate::TRANSLATE_STEP_BEFORE_TRANSLATE &&
       !translate_manager_->GetLanguageState().HasLanguageChanged()) {
     return;
   }
 
-  base::scoped_nsobject<CWVTranslateManagerImpl> criwv_manager(
-      [[CWVTranslateManagerImpl alloc]
-          initWithTranslateManager:translate_manager_.get()
-                    sourceLanguage:source_language
-                    targetLanguage:target_language]);
+  if (!cwv_translation_controller_.get()) {

[Eugene But (OOO till 7-30), 2017/04/28 03:07:29]

no need for .get()

[jzw1, 2017/04/28 05:43:36]

Done.

+    return;
+  }
 
-  CRIWVTransateStep criwv_step;
-  switch (step) {
-    case translate::TRANSLATE_STEP_BEFORE_TRANSLATE:
-      criwv_step = CRIWVTransateStepBeforeTranslate;
-      break;
-    case translate::TRANSLATE_STEP_TRANSLATING:
-      criwv_step = CRIWVTransateStepTranslating;
-      break;
-    case translate::TRANSLATE_STEP_AFTER_TRANSLATE:
-      criwv_step = CRIWVTransateStepAfterTranslate;
-      break;
-    case translate::TRANSLATE_STEP_TRANSLATE_ERROR:
-      criwv_step = CRIWVTransateStepError;
-      break;
-    case translate::TRANSLATE_STEP_NEVER_TRANSLATE:
-      NOTREACHED() << "Never translate is not supported yet in web_view.";
-      criwv_step = CRIWVTransateStepError;
-      break;
-  }
-  [delegate_ translateStepChanged:criwv_step manager:criwv_manager.get()];
+  [cwv_translation_controller_ updateTranslateStep:step
+                                    sourceLanguage:source_language
+                                    targetLanguage:target_language
+                                         errorType:error_type
+                                 triggeredFromMenu:triggered_from_menu];
 }
 
 translate::TranslateDriver* WebViewTranslateClient::GetTranslateDriver() {
   return &translate_driver_;
 }
 
 PrefService* WebViewTranslateClient::GetPrefs() {
   DCHECK(web_state());
   return WebViewBrowserState::FromBrowserState(web_state()->GetBrowserState())
       ->GetPrefs();
@@ skipping 31 matching lines @@
 }
 
 void WebViewTranslateClient::WebStateDestroyed() {
   // Translation process can be interrupted.
   // Destroying the TranslateManager now guarantees that it never has to deal
   // with nullptr WebState.
   translate_manager_.reset();
 }
 
 }  // namespace ios_web_view