[iOS] Move omnibox popup files into a separate directory.

Moves popup-related classes into i/c/b/ui/omnibox/popup and performs
necessary changes to BUILD.gn files.

Bug: None
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I81bd232799092160463065d874328b015b5d8a8e
Reviewed-on: https://chromium-review.googlesource.com/929141Reviewed-by: Mark Cogan <marq@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#540852}

ios/chrome/browser/prerender/BUILD.gn

@@ -65,6 +65,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
+    "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/web/public/test/http_server",

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

@@ -17,6 +17,21 @@ source_set("omnibox") {
   ]
 }
 
+source_set("omnibox_popup_shared") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "truncating_attributed_label.h",
+    "truncating_attributed_label.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/omnibox/browser",
+  ]
+  public_deps = [
+    "//ui/base",
+  ]
+}
+
 source_set("omnibox_util") {
   sources = [
     "omnibox_util.cc",
@@ -26,6 +41,8 @@ source_set("omnibox_util") {
     "//base",
     "//components/omnibox/browser",
     "//components/security_state/core",
+  ]
+  public_deps = [
     "//ios/chrome/app/theme",
   ]
 }
@@ -48,19 +65,6 @@ source_set("omnibox_internal") {
     "image_retriever.h",
     "location_bar_controller_impl.h",
     "location_bar_controller_impl.mm",
-    "omnibox_popup_mediator.h",
-    "omnibox_popup_mediator.mm",
-    "omnibox_popup_positioner.h",
-    "omnibox_popup_presenter.h",
-    "omnibox_popup_presenter.mm",
-    "omnibox_popup_provider.h",
-    "omnibox_popup_row.h",
-    "omnibox_popup_row.mm",
-    "omnibox_popup_view_controller.h",
-    "omnibox_popup_view_controller.mm",
-    "omnibox_popup_view_ios.h",
-    "omnibox_popup_view_ios.mm",
-    "omnibox_popup_view_suggestions_delegate.h",
     "omnibox_text_field_delegate.h",
     "omnibox_text_field_ios.h",
     "omnibox_text_field_ios.mm",
@@ -68,18 +72,16 @@ source_set("omnibox_internal") {
     "omnibox_text_field_paste_delegate.mm",
     "omnibox_view_ios.h",
     "omnibox_view_ios.mm",
-    "truncating_attributed_label.h",
-    "truncating_attributed_label.mm",
   ]
   deps = [
     ":omnibox",
+    ":omnibox_popup_shared",
     ":omnibox_util",
     "resources:omnibox_background",
     "resources:omnibox_transparent_background",
     "//base",
     "//components/favicon/ios",
     "//components/image_fetcher/ios",
-    "//components/open_from_clipboard",
     "//components/resources",
     "//components/search_engines",
     "//components/security_state/core",

ios/chrome/browser/ui/omnibox/location_bar_controller_impl.mm

@@ -24,9 +24,9 @@
 #import "ios/chrome/browser/ui/location_bar/location_bar_url_loader.h"
 #import "ios/chrome/browser/ui/location_bar/location_bar_view.h"
 #import "ios/chrome/browser/ui/omnibox/location_bar_delegate.h"
-#include "ios/chrome/browser/ui/omnibox/omnibox_popup_view_ios.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.h"
 #import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_coordinator.h"
+#include "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_ios.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/omnibox/omnibox_popup_row.h

-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2018 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.
 
-#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_ROW_H_
-#define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_ROW_H_
-
-#import <UIKit/UIKit.h>
-
-@class OmniboxPopupTruncatingLabel;
-
-// View used to display an omnibox autocomplete match in the omnibox popup.
-@interface OmniboxPopupRow : UITableViewCell
-
-// A truncate-by-fading version of the textLabel of a UITableViewCell.
-@property(nonatomic, readonly, strong)
-    OmniboxPopupTruncatingLabel* textTruncatingLabel;
-// A truncate-by-fading version of the detailTextLabel of a UITableViewCell.
-@property(nonatomic, readonly, strong)
-    OmniboxPopupTruncatingLabel* detailTruncatingLabel;
-// A standard UILabel for answers, which truncates with ellipses to support
-// multi-line text.
-@property(nonatomic, readonly, strong) UILabel* detailAnswerLabel;
-
-@property(nonatomic, readonly, strong) UIImageView* imageView;
-@property(nonatomic, readonly, strong) UIImageView* answerImageView;
-@property(nonatomic, readonly, strong) UIButton* appendButton;
-@property(nonatomic, assign) CGFloat rowHeight;
-
-// Initialize the row with the given incognito state. The colors and styling are
-// dependent on whether or not the row is displayed in incognito mode.
-- (instancetype)initWithIncognito:(BOOL)incognito;
-
-// Update the match type icon with the supplied image ID and adjust its position
-// based on the current size of the row.
-- (void)updateLeadingImage:(int)imageID;
-
-@end
-
-#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_ROW_H_
+// TODO(crbug.com/814732): Remove this file once it's not included downstream.
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.h"

ios/chrome/browser/ui/omnibox/omnibox_view_ios.h

@@ -10,9 +10,9 @@
 #include <memory>
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/toolbar/toolbar_model.h"
-#include "ios/chrome/browser/ui/omnibox/omnibox_popup_provider.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_view_suggestions_delegate.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.h"
+#include "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_provider.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_suggestions_delegate.h"
 
 struct AutocompleteMatch;
 class AutocompleteResult;

ios/chrome/browser/ui/omnibox/popup/BUILD.gn

@@ -6,12 +6,53 @@ source_set("popup") {
   sources = [
     "omnibox_popup_coordinator.h",
     "omnibox_popup_coordinator.mm",
+    "omnibox_popup_mediator.h",
+    "omnibox_popup_mediator.mm",
+    "omnibox_popup_positioner.h",
+    "omnibox_popup_presenter.h",
+    "omnibox_popup_presenter.mm",
+    "omnibox_popup_provider.h",
+    "omnibox_popup_view_controller.h",
+    "omnibox_popup_view_controller.mm",
+    "omnibox_popup_view_ios.h",
+    "omnibox_popup_view_ios.mm",
+    "omnibox_popup_view_suggestions_delegate.h",
   ]
   deps = [
+    ":popup_internal",
     "//base",
     "//components/image_fetcher/ios",
     "//components/omnibox/browser",
+    "//components/open_from_clipboard",
+    "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui:ui",
+    "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
+    "//ios/chrome/browser/ui/omnibox:omnibox_util",
+    "//ios/chrome/browser/ui/toolbar/public:public",
+    "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+    "//ios/chrome/browser/ui/util:util",
+    "//ios/web/public:public",
+    "//net",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("popup_internal") {
+  sources = [
+    "omnibox_popup_row.h",
+    "omnibox_popup_row.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/image_fetcher/ios",
+    "//components/omnibox/browser",
+    "//ios/chrome/app/theme:theme",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
+    "//ios/chrome/browser/ui/util:util",
     "//net",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_coordinator.mm

@@ -7,10 +7,10 @@
 #import "components/image_fetcher/ios/ios_image_data_fetcher_wrapper.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_mediator.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_presenter.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_view_controller.h"
-#include "ios/chrome/browser/ui/omnibox/omnibox_popup_view_ios.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_mediator.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller.h"
+#include "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_ios.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/omnibox/omnibox_popup_mediator.mm → ios/chrome/browser/ui/omnibox/popup/omnibox_popup_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/omnibox/omnibox_popup_mediator.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_mediator.h"
 
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
@@ -11,7 +11,7 @@
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #import "ios/chrome/browser/ui/omnibox/autocomplete_match_formatter.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_presenter.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/omnibox/omnibox_popup_presenter.mm → ios/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.mm

@@ -2,9 +2,9 @@
 // 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/omnibox/omnibox_popup_presenter.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.h"
 
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_positioner.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_positioner.h"
 #import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.h

+// Copyright (c) 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.
+
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_ROW_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_ROW_H_
+
+#import <UIKit/UIKit.h>
+
+@class OmniboxPopupTruncatingLabel;
+
+// View used to display an omnibox autocomplete match in the omnibox popup.
+@interface OmniboxPopupRow : UITableViewCell
+
+// A truncate-by-fading version of the textLabel of a UITableViewCell.
+@property(nonatomic, readonly, strong)
+    OmniboxPopupTruncatingLabel* textTruncatingLabel;
+// A truncate-by-fading version of the detailTextLabel of a UITableViewCell.
+@property(nonatomic, readonly, strong)
+    OmniboxPopupTruncatingLabel* detailTruncatingLabel;
+// A standard UILabel for answers, which truncates with ellipses to support
+// multi-line text.
+@property(nonatomic, readonly, strong) UILabel* detailAnswerLabel;
+
+@property(nonatomic, readonly, strong) UIImageView* imageView;
+@property(nonatomic, readonly, strong) UIImageView* answerImageView;
+@property(nonatomic, readonly, strong) UIButton* appendButton;
+@property(nonatomic, assign) CGFloat rowHeight;
+
+// Initialize the row with the given incognito state. The colors and styling are
+// dependent on whether or not the row is displayed in incognito mode.
+- (instancetype)initWithIncognito:(BOOL)incognito;
+
+// Update the match type icon with the supplied image ID and adjust its position
+// based on the current size of the row.
+- (void)updateLeadingImage:(int)imageID;
+
+@end
+
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_ROW_H_

ios/chrome/browser/ui/omnibox/omnibox_popup_row.mm → ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.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/omnibox/omnibox_popup_row.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.h"
 
 #include "base/logging.h"
 

ios/chrome/browser/ui/omnibox/omnibox_popup_view_controller.mm → ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller.mm

@@ -2,15 +2,15 @@
 // 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/omnibox/omnibox_popup_view_controller.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller.h"
 
 #include <memory>
 
 #include "base/ios/ios_util.h"
 #include "ios/chrome/browser/ui/animation_util.h"
 #import "ios/chrome/browser/ui/omnibox/image_retriever.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_row.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_util.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.h"
 #import "ios/chrome/browser/ui/omnibox/truncating_attributed_label.h"
 #include "ios/chrome/browser/ui/rtl_geometry.h"
 #include "ios/chrome/browser/ui/ui_util.h"

ios/chrome/browser/ui/omnibox/omnibox_popup_view_ios.h → ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_ios.h

@@ -11,9 +11,9 @@
 
 #include "base/strings/string16.h"
 #include "components/omnibox/browser/omnibox_popup_view.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_mediator.h"
-#include "ios/chrome/browser/ui/omnibox/omnibox_popup_provider.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_view_controller.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_mediator.h"
+#include "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_provider.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller.h"
 
 class OmniboxEditModel;
 @class OmniboxPopupMediator;

ios/chrome/browser/ui/omnibox/omnibox_popup_view_ios.mm → ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_ios.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.
 
-#include "ios/chrome/browser/ui/omnibox/omnibox_popup_view_ios.h"
+#include "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_ios.h"
 
 #import <QuartzCore/QuartzCore.h>
 
@@ -18,9 +18,9 @@
 #include "components/open_from_clipboard/clipboard_recent_content.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/experimental_flags.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_mediator.h"
-#include "ios/chrome/browser/ui/omnibox/omnibox_popup_view_suggestions_delegate.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_util.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_mediator.h"
+#include "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_suggestions_delegate.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_theme_resources.h"

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

@@ -138,6 +138,9 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/ntp:ntp_controller",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
+    "//ios/chrome/browser/ui/omnibox/popup",
+    "//ios/chrome/browser/ui/omnibox/popup:popup_internal",
+    "//ios/chrome/browser/ui/omnibox/popup:popup_internal",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/legacy",
     "//ios/chrome/browser/ui/tools_menu/public",

ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_coordinator.mm

@@ -15,8 +15,8 @@
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_ui_updater.h"
 #import "ios/chrome/browser/ui/location_bar/location_bar_coordinator.h"
 #import "ios/chrome/browser/ui/ntp/ntp_util.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_positioner.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_positioner.h"
 #import "ios/chrome/browser/ui/orchestrator/omnibox_focus_orchestrator.h"
 #import "ios/chrome/browser/ui/toolbar/adaptive/adaptive_toolbar_coordinator+subclassing.h"
 #import "ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_view_controller.h"

ios/chrome/browser/ui/toolbar/clean/BUILD.gn

@@ -37,6 +37,7 @@ source_set("toolbar") {
     "//ios/chrome/browser/ui/ntp:util",
     "//ios/chrome/browser/ui/omnibox",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
+    "//ios/chrome/browser/ui/omnibox/popup",
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/buttons/resources:toolbar_search",

ios/chrome/browser/ui/toolbar/clean/toolbar_coordinator.mm

@@ -20,8 +20,8 @@
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_ui_updater.h"
 #import "ios/chrome/browser/ui/location_bar/location_bar_coordinator.h"
 #import "ios/chrome/browser/ui/ntp/ntp_util.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_positioner.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_positioner.h"
 #import "ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.h"
 #import "ios/chrome/browser/ui/toolbar/buttons/toolbar_button_visibility_configuration.h"
 #import "ios/chrome/browser/ui/toolbar/buttons/toolbar_style.h"

ios/chrome/browser/ui/toolbar/toolbar_egtest.mm

@@ -10,7 +10,7 @@
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller.h"
-#import "ios/chrome/browser/ui/omnibox/omnibox_popup_row.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.h"
 #import "ios/chrome/browser/ui/toolbar/clean/toolbar_view.h"
 #import "ios/chrome/browser/ui/toolbar/legacy/toolbar_controller.h"
 #include "ios/chrome/browser/ui/tools_menu/public/tools_menu_constants.h"