Omnibox UI Experiments: Make suggestions dropdown match omnibox width.

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
+#include "base/feature_list.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 22 matching lines @@
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/zoom_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h"
 #include "chrome/browser/ui/views/translate/translate_bubble_view.h"
 #include "chrome/browser/ui/views/translate/translate_icon_view.h"
 #include "chrome/grit/chromium_strings.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/favicon/content/content_favicon_driver.h"
+#include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "components/omnibox/browser/omnibox_popup_view.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/toolbar/toolbar_model.h"
 #include "components/translate/core/browser/language_state.h"
 #include "components/variations/variations_associated_data.h"
 #include "components/zoom/zoom_controller.h"
 #include "components/zoom/zoom_event_manager.h"
@@ skipping 300 matching lines @@
     return this;
   return location_icon_view()->GetImageView();
 }
 
 void LocationBarView::GetOmniboxPopupPositioningInfo(
     gfx::Point* top_left_screen_coord,
     int* popup_width,
     int* left_margin,
     int* right_margin,
     int top_edge_overlap) {
-  *top_left_screen_coord = gfx::Point(0, parent()->height() - top_edge_overlap);
+  bool narrow_popup =
+      base::FeatureList::IsEnabled(omnibox::kUIExperimentNarrowDropdown);
+
+  *top_left_screen_coord =
+      gfx::Point(narrow_popup ? x() : 0, parent()->height() - top_edge_overlap);
   views::View::ConvertPointToScreen(parent(), top_left_screen_coord);
 
-  *popup_width = parent()->width();
-  *left_margin = x();
-  *right_margin = *popup_width - bounds().right();
+  *popup_width = narrow_popup ? width() : parent()->width();
+  *left_margin = narrow_popup ? 0 : x();
+  *right_margin = narrow_popup ? 0 : *popup_width - bounds().right();

[Peter Kasting, 2017/06/09 02:17:53]

Nit: Reading this, it felt a bit cryptic and error-prone.  This felt a bit
clearer, and with fewer conditionals:

  // The popup contents are always sized matching the location bar size.
  const int popup_contents_left = x();
  const int popup_contents_right = bounds().right();

  // The popup itself may either be the same width as the contents, or as wide
  // as the toolbar.
  const bool narrow_popup = ...;
  const int popup_left = narrow_popup ? popup_contents_left : 0;
  const int popup_right =
      narrow_popup ? popup_contents_right : parent()->width();

  *top_left_screen_coord = gfx::Point(popup_left, ...);
  ...

  *popup_width = popup_right - popup_left;
  *left_margin = popup_contents_left - popup_left;
  *right_margin = popup_right - popup_contents_right;

[tommycli, 2017/06/09 16:26:51]

Done.

 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, public LocationBar implementation:
 
 void LocationBarView::FocusLocation(bool select_all) {
   omnibox_view_->SetFocus();
   if (select_all)
     omnibox_view_->SelectAll(true);
 }
@@ skipping 655 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = nullptr;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }