Revert "Increase omnibox size by 2 px. Increase nominal font size in omnibox to 16 px."

chrome/browser/ui/gtk/location_bar_view_gtk.cc

 // Copyright 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/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1089 matching lines @@
       NOTREACHED();
   }
 }
 
 gboolean LocationBarViewGtk::HandleExpose(GtkWidget* widget,
                                           GdkEventExpose* event) {
   // If we're not using GTK theming, draw our own border over the edge pixels
   // of the background.
   if (!GtkThemeService::GetFrom(browser_->profile())->UsingNativeTheme()) {
     if (popup_window_mode_) {
-      NineBox(IDR_OMNIBOX_POPUP_BORDER_TOP_LEFT,
-              IDR_OMNIBOX_POPUP_BORDER_TOP,
-              IDR_OMNIBOX_POPUP_BORDER_TOP_RIGHT,
-              IDR_OMNIBOX_POPUP_BORDER_LEFT,
-              IDR_OMNIBOX_POPUP_BORDER_MIDDLE,
-              IDR_OMNIBOX_POPUP_BORDER_RIGHT,
-              IDR_OMNIBOX_POPUP_BORDER_BOTTOM_LEFT,
-              IDR_OMNIBOX_POPUP_BORDER_BOTTOM,
-              IDR_OMNIBOX_POPUP_BORDER_BOTTOM_RIGHT).RenderToWidget(widget);
+      NineBox(IDR_OMNIBOX_POPUP_BORDER_EDGE,
+              IDR_OMNIBOX_POPUP_BORDER_CENTER,
+              IDR_OMNIBOX_POPUP_BORDER_EDGE,
+              0, 0, 0, 0, 0, 0).RenderToWidget(widget);
     } else {
-      NineBox(IDR_OMNIBOX_BORDER_TOP_LEFT,
-              IDR_OMNIBOX_BORDER_TOP,
-              IDR_OMNIBOX_BORDER_TOP_RIGHT,
-              IDR_OMNIBOX_BORDER_LEFT,
-              IDR_OMNIBOX_BORDER_MIDDLE,
-              IDR_OMNIBOX_BORDER_RIGHT,
-              IDR_OMNIBOX_BORDER_BOTTOM_LEFT,
-              IDR_OMNIBOX_BORDER_BOTTOM,
-              IDR_OMNIBOX_BORDER_BOTTOM_RIGHT).RenderToWidget(widget);
+      NineBox(IDR_OMNIBOX_BORDER, 5, 5, 4, 4).RenderToWidget(widget);
     }
   }
 
   // Draw ExtensionAction backgrounds and borders, if necessary.  The borders
   // appear exactly between the elements, so they can't draw the borders
   // themselves.
   gfx::CanvasSkiaPaint canvas(event, /*opaque=*/false);
   for (ScopedVector<PageActionViewGtk>::const_iterator
            page_action_view = page_action_views_.begin();
        page_action_view != page_action_views_.end();
@@ skipping 969 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }