Remove logo from Physical Web omnibox suggestions

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

 // 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.
 
 #import "ios/chrome/browser/ui/omnibox/omnibox_popup_material_view_controller.h"
 
 #include <memory>
 
 #include "base/ios/ios_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"
-#include "base/metrics/user_metrics.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/suggestion_answer.h"
 #include "ios/chrome/browser/ui/animation_util.h"
-#import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
-#include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_popup_material_row.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_popup_view_ios.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_util.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"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
@@ skipping 147 matching lines @@
     OmniboxPopupMaterialRow* row = [[[OmniboxPopupMaterialRow alloc]
         initWithIncognito:_incognito] autorelease];
     row.accessibilityIdentifier =
         [NSString stringWithFormat:@"omnibox suggestion %i", i];
     row.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     [rowsBuilder addObject:row];
     [row.appendButton addTarget:self
                          action:@selector(appendButtonTapped:)
                forControlEvents:UIControlEventTouchUpInside];
     [row.appendButton setTag:i];
-    [row.physicalWebButton addTarget:self
-                              action:@selector(physicalWebButtonTapped:)
-                    forControlEvents:UIControlEventTouchUpInside];
     row.rowHeight = kRowHeight;
   }
   _rows.reset([rowsBuilder copy]);
 
   // Table configuration.
   self.tableView.allowsMultipleSelectionDuringEditing = NO;
   self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
   self.tableView.separatorInset = UIEdgeInsetsZero;
   if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)]) {
     [self.tableView setLayoutMargins:UIEdgeInsetsZero];
@@ skipping 169 matching lines @@
   [textLabel setNeedsDisplay];
 
   // The leading image (e.g. magnifying glass, star, clock) is only shown on
   // iPad.
   if (IsIPadIdiom()) {
     int imageId = GetIconForAutocompleteMatchType(
         match.type, _popupView->IsStarredMatch(match), _incognito);
     [row updateLeadingImage:imageId];
   }
 
-  // Show append button for search history/search suggestions/voice search as
+  // Show append button for search history/search suggestions/Physical Web as
   // the right control element (aka an accessory element of a table view cell).
-  BOOL autocompleteSearchMatch =
-      match.type == AutocompleteMatchType::SEARCH_HISTORY ||
-      match.type == AutocompleteMatchType::SEARCH_SUGGEST;
-  row.appendButton.hidden = !autocompleteSearchMatch;
+  BOOL appendableMatch = match.type == AutocompleteMatchType::SEARCH_HISTORY ||
+                         match.type == AutocompleteMatchType::SEARCH_SUGGEST ||
+                         match.type == AutocompleteMatchType::PHYSICAL_WEB;
+  row.appendButton.hidden = !appendableMatch;
   [row.appendButton cancelTrackingWithEvent:nil];
 
-  // Show the Physical Web logo as the right accessory image for Physical Web
-  // suggestions.
-  BOOL physicalWebMatch =
-      match.type == AutocompleteMatchType::PHYSICAL_WEB ||
-      match.type == AutocompleteMatchType::PHYSICAL_WEB_OVERFLOW;
-  row.physicalWebButton.hidden = !physicalWebMatch;
-  [row.physicalWebButton cancelTrackingWithEvent:nil];
-
   // If a right accessory element is present or the text alignment is right
   // aligned, adjust the width to align with the accessory element.
-  if (autocompleteSearchMatch || physicalWebMatch || alignmentRight) {
+  if (appendableMatch || alignmentRight) {
     LayoutRect layout =
         LayoutRectForRectInBoundingRect(textLabel.frame, self.view.frame);
     layout.size.width -= kAppendButtonWidth;
     textLabel.frame = LayoutRectGetRect(layout);
     layout =
         LayoutRectForRectInBoundingRect(detailTextLabel.frame, self.view.frame);
     layout.size.width -=
         kAppendButtonWidth + (answerImagePresent ? answerImagePadding : 0);
     detailTextLabel.frame = LayoutRectGetRect(layout);
   }
@@ skipping 236 matching lines @@
 - (void)appendButtonTapped:(id)sender {
   NSUInteger row = [sender tag];
   const AutocompleteMatch& match =
       ((const AutocompleteResult&)_currentResult).match_at(row);
   // Make a defensive copy of |match.contents|, as CopyToOmnibox() will trigger
   // a new round of autocomplete and modify |_currentResult|.
   base::string16 contents(match.contents);
   _popupView->CopyToOmnibox(contents);
 }
 
-- (void)physicalWebButtonTapped:(id)sender {
-  base::scoped_nsobject<GenericChromeCommand> command([
-      [GenericChromeCommand alloc] initWithTag:IDC_SHOW_PHYSICAL_WEB_SETTINGS]);

[rohitrao (ping after 24h), 2017/02/03 21:11:10]

Is this the only place that we send this command?  Can we remove the supporting
code from MainController and remove the command id?

[mattreynolds, 2017/02/03 22:41:45]

Done.

-  [command executeOnMainWindow];
-
-  // Record when the user opens the Physical Web preference page from the
-  // omnibox suggestion.
-  base::RecordAction(base::UserMetricsAction("PhysicalWeb.Prefs.FromOmnibox"));
-}
-
 #pragma mark -
 #pragma mark UIScrollViewDelegate
 
 - (void)scrollViewDidScroll:(UIScrollView*)scrollView {
   // Setting the top inset of the scrollView to |kTopAndBottomPadding| causes a
   // one time scrollViewDidScroll to |-kTopAndBottomPadding|.  It's easier to
   // just ignore this one scroll tick.
   if (scrollView.contentOffset.y == 0 - kTopAndBottomPadding)
     return;
 
@@ skipping 130 matching lines @@
     // The delete button never disappears if you don't call this after a tap.
     // It doesn't seem to be required anywhere else.
     [_rows[indexPath.row] prepareForReuse];
     const AutocompleteMatch& match =
         ((const AutocompleteResult&)_currentResult).match_at(indexPath.row);
     _popupView->DeleteMatch(match);
   }
 }
 
 @end