Converts some of the omnibox related classes to support multiple

chrome/browser/ui/views/location_bar/keyword_hint_view.cc

Index: chrome/browser/ui/views/location_bar/keyword_hint_view.cc
diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
index 06b47c5b20c6cff5c26c9972114c34cdf4508d66..e47fb981717d766af2d4b1cbb8d0150a6a87e003 100644
--- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
+++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
@@ -27,9 +27,11 @@ 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();
@@ -129,11 +131,12 @@ void KeywordHintView::Layout() {
   }
 }
 
-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;