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

chrome/browser/ui/views/location_bar/selected_keyword_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/selected_keyword_view.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/omnibox/location_bar_util.h"
 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/painter.h"
 
 
 namespace {
-const int kBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_SELECTED_KEYWORD_BUBBLE);
+const int kBackgroundImages[] = {
+  IDR_OMNIBOX_SELECTED_KEYWORD_BUBBLE_LEFT,
+  IDR_OMNIBOX_SELECTED_KEYWORD_BUBBLE_CENTER,
+  IDR_OMNIBOX_SELECTED_KEYWORD_BUBBLE_RIGHT,
+};
 }
 
 
 SelectedKeywordView::SelectedKeywordView(const gfx::Font& font,
                                          int font_y_offset,
                                          SkColor text_color,
                                          SkColor parent_background_color,
                                          Profile* profile)
     : IconLabelBubbleView(kBackgroundImages, IDR_KEYWORD_SEARCH_MAGNIFIER, font,
                           font_y_offset, text_color, parent_background_color,
@@ skipping 42 matching lines @@
       l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, short_name);
   full_label_.SetText(full_name);
 
   const string16 min_string(location_bar_util::CalculateMinString(short_name));
   const string16 partial_name = is_extension_keyword ?
       min_string :
       l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string);
   partial_label_.SetText(min_string.empty() ?
       full_label_.text() : partial_name);
 }