Converts some of the omnibox related classes to support multiple

chrome/browser/ui/views/location_bar/keyword_hint_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/keyword_hint_view.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.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/views/location_bar/location_bar_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/label.h"
 
 // Amount of space to offset the tab image from the top of the view by.
 static const int kTabImageYOffset = 1;
 
 // The tab key image.
 static const gfx::ImageSkia* kTabButtonImage = NULL;
 
-KeywordHintView::KeywordHintView(Profile* profile) : profile_(profile) {
-  leading_label_ = CreateLabel();
-  trailing_label_ = CreateLabel();
+KeywordHintView::KeywordHintView(Profile* profile,
+                                 const LocationBarView* location_bar_view)
+    : profile_(profile) {
+  leading_label_ = CreateLabel(location_bar_view);
+  trailing_label_ = CreateLabel(location_bar_view);
 
   if (!kTabButtonImage) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     kTabButtonImage = rb.GetImageSkiaNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB);
   }
 }
 
 KeywordHintView::~KeywordHintView() {
 }
 
@@ skipping 79 matching lines @@
   if (show_labels) {
     pref = leading_label_->GetPreferredSize();
     leading_label_->SetBounds(x, 0, pref.width(), height());
 
     x += pref.width() + kTabButtonImage->width();
     pref = trailing_label_->GetPreferredSize();
     trailing_label_->SetBounds(x, 0, pref.width(), height());
   }
 }
 
-views::Label* KeywordHintView::CreateLabel() {
+views::Label* KeywordHintView::CreateLabel(
+    const LocationBarView* location_bar_view) {
   views::Label* label = new views::Label();
-  label->SetBackgroundColor(LocationBarView::GetColor(
+  label->SetBackgroundColor(location_bar_view->GetColor(
       ToolbarModel::NONE, LocationBarView::BACKGROUND));
-  label->SetEnabledColor(LocationBarView::GetColor(
+  label->SetEnabledColor(location_bar_view->GetColor(
       ToolbarModel::NONE, LocationBarView::DEEMPHASIZED_TEXT));
   AddChildView(label);
   return label;
 }