Fix layout of omnibox rows for material design

chrome/browser/ui/views/layout_constants.cc

 // Copyright 2015 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/layout_constants.h"
 
 #include "base/logging.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 
 int GetLayoutConstant(LayoutConstant constant) {
@@ skipping 77 matching lines @@
   }
   NOTREACHED();
   return 0;
 }
 
 gfx::Insets GetLayoutInsets(LayoutInset inset) {
   const int kAvatarLeftPadding[] = {2, 4, 4};
   const int kAvatarRightPadding[] = {-6, 4, 4};
   const int kAvatarBottomPadding[] = {2, 4, 4};
   const int kOmniboxDropdownIconPadding[] = {2, 4, 8};
-  const int kOmniboxDropdownTextPadding[] = {3, 4, 8};
+  const int kOmniboxDropdownPadding[] = {3, 4, 4};
+  const int kOmniboxDropdownTextPadding[] = {3, 3, 3};
   const int kTabBottomPadding[] = {2, 2, 2};
   const int kTabLeftPadding[] = {20, 20, 20};
   const int kTabRightPadding[] = {20, 20, 20};
   const int kTabTopPadding[] = {4, 4, 4};
   const int kToolbarBottomPadding[] = {5, 5, 5};
   const int kToolbarButtonPadding[] = {2, 6, 6};
   const int kToolbarLeftPadding[] = {3, 4, 8};
   const int kToolbarRightPadding[] = {2, 4, 8};
   const int kToolbarTopPadding[] = {5, 4, 4};
 
   const int mode = ui::MaterialDesignController::GetMode();
   switch (inset) {
     case AVATAR_ICON: {
       return gfx::Insets(0, kAvatarLeftPadding[mode],
                          kAvatarBottomPadding[mode], kAvatarRightPadding[mode]);
     }
+    case OMNIBOX_DROPDOWN: {
+      const int padding = kOmniboxDropdownPadding[mode];
+      return gfx::Insets(padding, 0, padding, 0);
+    }
     case OMNIBOX_DROPDOWN_ICON: {
       const int padding = kOmniboxDropdownIconPadding[mode];
       return gfx::Insets(padding, 0, padding, 0);
     }
     case OMNIBOX_DROPDOWN_TEXT: {
       const int padding = kOmniboxDropdownTextPadding[mode];
       return gfx::Insets(padding, 0, padding, 0);
     }
     case TAB:
       return gfx::Insets(kTabTopPadding[mode], kTabLeftPadding[mode],
                          kTabBottomPadding[mode], kTabRightPadding[mode]);
     case TOOLBAR:
       return gfx::Insets(kToolbarTopPadding[mode], kToolbarLeftPadding[mode],
                          kToolbarBottomPadding[mode],
                          kToolbarRightPadding[mode]);
     case TOOLBAR_BUTTON: {
       const int inset = kToolbarButtonPadding[mode];
       return gfx::Insets(inset, inset, inset, inset);
     }
   }
   NOTREACHED();
   return gfx::Insets();
 }