[iOS][Translate] Renames translate_popup_menu_coordinator/mediator

Renames translate_popup_menu_coordinator and translate_popup_menu_mediator
to translate_infobar_coordinator and translate_infobar_mediator as they
have more responsiblities than only displaying/dismissing the translate
infobar popup menus, e.g., handling translate options notifications.

Bug: 910994
Change-Id: Id6e0df35ee8216b3d498ab407f58e08c4314ae40
Reviewed-on: https://chromium-review.googlesource.com/c/1436941
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Commit-Queue: Mark Cogan <marq@chromium.org>
Auto-Submit: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626110}

ios/chrome/browser/ui/main/browser_coordinator.mm

@@ -39,7 +39,7 @@
 #import "ios/chrome/browser/ui/recent_tabs/recent_tabs_coordinator.h"
 #import "ios/chrome/browser/ui/snackbar/snackbar_coordinator.h"
 #import "ios/chrome/browser/ui/translate/language_selection_coordinator.h"
-#import "ios/chrome/browser/ui/translate/translate_popup_menu_coordinator.h"
+#import "ios/chrome/browser/ui/translate/translate_infobar_coordinator.h"
 #import "ios/chrome/browser/web/print_tab_helper.h"
 #import "ios/chrome/browser/web/repost_form_tab_helper.h"
 #import "ios/chrome/browser/web/repost_form_tab_helper_delegate.h"
@@ -115,7 +115,7 @@
 // Coordinator for the translate infobar's language selection and translate
 // option popup menus.
 @property(nonatomic, strong)
-    TranslatePopupMenuCoordinator* translatePopupMenuCoordinator;
+    TranslateInfobarCoordinator* translateInfobarCoordinator;
 
 @end
 
@@ -256,11 +256,11 @@
   }
 
   if (base::FeatureList::IsEnabled(translate::kCompactTranslateInfobarIOS)) {
-    self.translatePopupMenuCoordinator = [[TranslatePopupMenuCoordinator alloc]
+    self.translateInfobarCoordinator = [[TranslateInfobarCoordinator alloc]
         initWithBaseViewController:self.viewController
                       browserState:self.browserState
                       webStateList:self.tabModel.webStateList];
-    [self.translatePopupMenuCoordinator start];
+    [self.translateInfobarCoordinator start];
   } else {
     self.languageSelectionCoordinator = [[LanguageSelectionCoordinator alloc]
         initWithBaseViewController:self.viewController
@@ -342,8 +342,8 @@
   [self.storeKitCoordinator stop];
   self.storeKitCoordinator = nil;
 
-  [self.translatePopupMenuCoordinator stop];
-  self.translatePopupMenuCoordinator = nil;
+  [self.translateInfobarCoordinator stop];
+  self.translateInfobarCoordinator = nil;
 }
 
 #pragma mark - BrowserCoordinatorCommands

ios/chrome/browser/ui/translate/BUILD.gn

@@ -9,10 +9,10 @@ source_set("translate") {
     "language_selection_coordinator.mm",
     "language_selection_mediator.h",
     "language_selection_mediator.mm",
-    "translate_popup_menu_coordinator.h",
-    "translate_popup_menu_coordinator.mm",
-    "translate_popup_menu_mediator.h",
-    "translate_popup_menu_mediator.mm",
+    "translate_infobar_coordinator.h",
+    "translate_infobar_coordinator.mm",
+    "translate_infobar_mediator.h",
+    "translate_infobar_mediator.mm",
   ]
   deps = [
     ":translate_ui",

ios/chrome/browser/ui/translate/translate_popup_menu_coordinator.h → ios/chrome/browser/ui/translate/translate_infobar_coordinator.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_POPUP_MENU_COORDINATOR_H_
-#define IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_POPUP_MENU_COORDINATOR_H_
+#ifndef IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_INFOBAR_COORDINATOR_H_
+#define IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_INFOBAR_COORDINATOR_H_
 
 #import <UIKit/UIKit.h>
 
@@ -11,9 +11,10 @@
 
 class WebStateList;
 
-// Coordinator for the translate infobar's language selection and translate
-// option popup menus.
-@interface TranslatePopupMenuCoordinator : ChromeCoordinator
+// Coordinator responsible for presenting and dismissing the translate infobar's
+// language selection popup menu, translate options popup menu, and translate
+// options notifications.
+@interface TranslateInfobarCoordinator : ChromeCoordinator
 
 // Creates a coordinator that uses |viewController|, |browserState|, and
 // |webStateList|.
@@ -30,4 +31,4 @@ class WebStateList;
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_POPUP_MENU_COORDINATOR_H_
+#endif  // IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_INFOBAR_COORDINATOR_H_

ios/chrome/browser/ui/translate/translate_popup_menu_coordinator.mm → ios/chrome/browser/ui/translate/translate_infobar_coordinator.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/translate/translate_popup_menu_coordinator.h"
+#import "ios/chrome/browser/ui/translate/translate_infobar_coordinator.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ -19,26 +19,25 @@
 #import "ios/chrome/browser/ui/popup_menu/public/popup_menu_table_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/popup_menu/public/popup_menu_ui_constants.h"
 #import "ios/chrome/browser/ui/translate/cells/select_language_popup_menu_item.h"
+#import "ios/chrome/browser/ui/translate/translate_infobar_mediator.h"
 #import "ios/chrome/browser/ui/translate/translate_notification_presenter.h"
-#import "ios/chrome/browser/ui/translate/translate_popup_menu_mediator.h"
 #import "ios/chrome/browser/ui/util/layout_guide_names.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
-@interface TranslatePopupMenuCoordinator () <
-    LanguageSelectionHandler,
-    PopupMenuPresenterDelegate,
-    PopupMenuTableViewControllerDelegate,
-    TranslateOptionSelectionHandler>
+@interface TranslateInfobarCoordinator () <LanguageSelectionHandler,
+                                           PopupMenuPresenterDelegate,
+                                           PopupMenuTableViewControllerDelegate,
+                                           TranslateOptionSelectionHandler>
 
 // The WebStateList this coordinator observes.
 @property(nonatomic, assign) WebStateList* webStateList;
 // Presenter for the popup menu, managing the animations.
 @property(nonatomic, strong) PopupMenuPresenter* popupMenuPresenter;
 // Mediator for the popup menu.
-@property(nonatomic, strong) TranslatePopupMenuMediator* mediator;
+@property(nonatomic, strong) TranslateInfobarMediator* mediator;
 // Presenter for the translate notifications.
 @property(nonatomic, strong)
     TranslateNotificationPresenter* notificationPresenter;
@@ -55,7 +54,7 @@
 
 @end
 
-@implementation TranslatePopupMenuCoordinator
+@implementation TranslateInfobarCoordinator
 
 - (instancetype)initWithBaseViewController:(UIViewController*)viewController
                               browserState:
@@ -78,7 +77,7 @@
 
   self.notificationPresenter = [[TranslateNotificationPresenter alloc] init];
 
-  self.mediator = [[TranslatePopupMenuMediator alloc]
+  self.mediator = [[TranslateInfobarMediator alloc]
       initWithSelectionHandler:self
            notificationHandler:self.notificationPresenter];
   self.mediator.webStateList = self.webStateList;

ios/chrome/browser/ui/translate/translate_popup_menu_mediator.h → ios/chrome/browser/ui/translate/translate_infobar_mediator.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_POPUP_MENU_MEDIATOR_H_
-#define IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_POPUP_MENU_MEDIATOR_H_
+#ifndef IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_INFOBAR_MEDIATOR_H_
+#define IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_INFOBAR_MEDIATOR_H_
 
 #import <Foundation/Foundation.h>
 
@@ -24,9 +24,11 @@ typedef NS_ENUM(NSInteger, TranslatePopupMenuType) {
   TranslatePopupMenuTypeTranslateOptionSelection,
 };
 
-// Mediator object to configure and provide data for the translate infobar's
-// language selection and translate option popup menus.
-@interface TranslatePopupMenuMediator : NSObject
+// Mediator responsible for installing UI handlers for and providing data for
+// the translate infobar's language selection popup menu as well as translate
+// options popup menus. Also installs the UI handler for the translate options
+// notfications.
+@interface TranslateInfobarMediator : NSObject
 
 // |selectionHandler| presents and dismisses the language selection UI as well
 // as the translate option selection UI. |notificationHandler| presents and
@@ -63,4 +65,4 @@ typedef NS_ENUM(NSInteger, TranslatePopupMenuType) {
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_POPUP_MENU_MEDIATOR_H_
+#endif  // IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_INFOBAR_MEDIATOR_H_

ios/chrome/browser/ui/translate/translate_popup_menu_mediator.mm → ios/chrome/browser/ui/translate/translate_infobar_mediator.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/translate/translate_popup_menu_mediator.h"
+#import "ios/chrome/browser/ui/translate/translate_infobar_mediator.h"
 
 #include <memory>
 
@@ -28,7 +28,7 @@
 #error "This file requires ARC support."
 #endif
 
-@interface TranslatePopupMenuMediator () <WebStateListObserving> {
+@interface TranslateInfobarMediator () <WebStateListObserving> {
   // WebStateList observers.
   std::unique_ptr<WebStateListObserverBridge> _webStateListObserverBridge;
   std::unique_ptr<ScopedObserver<WebStateList, WebStateListObserver>>
@@ -46,7 +46,7 @@
 
 @end
 
-@implementation TranslatePopupMenuMediator
+@implementation TranslateInfobarMediator
 
 - (instancetype)
     initWithSelectionHandler: