Change width of rows in material design omnibox dropdown

chrome/browser/ui/views/omnibox/omnibox_popup_contents_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/omnibox/omnibox_popup_contents_view.h"
 
 #include <algorithm>
 
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ skipping 98 matching lines @@
       current_frame_bounds.height() + current_height_delta);
   return current_frame_bounds;
 }
 
 void OmniboxPopupContentsView::LayoutChildren() {
   ui::ThemeProvider* theme_provider = location_bar_view_->GetThemeProvider();
   const int min_vertical_padding = theme_provider->GetDisplayProperty(
       ThemeProperties::PROPERTY_OMNIBOX_DROPDOWN_MIN_TEXT_VERTICAL_PADDING);
 
   gfx::Rect contents_rect = GetContentsBounds();
+  contents_rect.Inset(
+      0, views::NonClientFrameView::kClientEdgeThickness + min_vertical_padding,
+      0, min_vertical_padding);
 
-  contents_rect.Inset(
-      left_margin_,
-      views::NonClientFrameView::kClientEdgeThickness + min_vertical_padding,
-      right_margin_,
-      min_vertical_padding);
+  // In the non-material dropdown, the colored/clickable regions within the
+  // dropdown are only as wide as the location bar. In the material version,
+  // these are full width, and OmniboxResultView instead insets the icons/text
+  // inside to be aligned with the location bar.
+  if (!ui::MaterialDesignController::IsModeMaterial())
+    contents_rect.Inset(left_margin_, 0, right_margin_, 0);
+
   int top = contents_rect.y();
   for (size_t i = 0; i < AutocompleteResult::kMaxMatches; ++i) {
     View* v = child_at(i);
     if (v->visible()) {
       v->SetBounds(contents_rect.x(), top, contents_rect.width(),
                    v->GetPreferredSize().height());
       top = v->bounds().bottom();
     }
   }
 }
@@ skipping 371 matching lines @@
   size_t index = GetIndexForPoint(event.location());
   if (!HasMatchAt(index))
     return;
   omnibox_view_->OpenMatch(model_->result().match_at(index), disposition,
                            GURL(), base::string16(), index);
 }
 
 OmniboxResultView* OmniboxPopupContentsView::result_view_at(size_t i) {
   return static_cast<OmniboxResultView*>(child_at(static_cast<int>(i)));
 }