Converts some of the omnibox related classes to support multiple

chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_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/omnibox/touch_omnibox_popup_contents_view.h"
 
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
@@ skipping 70 matching lines @@
 
   // Draw a line at the bottom of each child except the last.  The
   // color of the line is determined to blend appropriately with the
   // most dominant of the two surrounding cells, in precedence order,
   // i.e. selected > hovered > normal.
   for (std::vector<View*>::const_iterator i(visible_children.begin());
        i + 1 != visible_children.end(); ++i) {
     TouchOmniboxResultView* child = static_cast<TouchOmniboxResultView*>(*i);
     TouchOmniboxResultView* next_child =
         static_cast<TouchOmniboxResultView*>(*(i + 1));
-    SkColor divider_color = OmniboxResultView::GetColor(
+    SkColor divider_color = child->GetColor(
         std::max(child->GetState(), next_child->GetState()),
         OmniboxResultView::DIVIDER);
     int line_y = child->y() + child->height() - 1;
     canvas->DrawLine(gfx::Point(bounds.x(), line_y),
                      gfx::Point(bounds.right(), line_y), divider_color);
   }
 }
 
 OmniboxResultView* TouchOmniboxPopupContentsView::CreateResultView(
     OmniboxResultViewModel* model,
     int model_index,
     const gfx::Font& font,
     const gfx::Font& bold_font) {
   return new TouchOmniboxResultView(model, model_index, font, bold_font);
 }
 
 std::vector<views::View*> TouchOmniboxPopupContentsView::GetVisibleChildren() {
   std::vector<View*> visible_children;
   for (int i = 0; i < child_count(); ++i) {
     View* v = child_at(i);
     if (child_at(i)->visible())
       visible_children.push_back(v);
   }
   return visible_children;
 }