Converts some of the omnibox related classes to support multiple

chrome/browser/ui/views/omnibox/omnibox_result_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_
 
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/animation/animation_delegate.h"
@@ skipping 29 matching lines @@
     DIVIDER,
     NUM_KINDS
   };
 
   OmniboxResultView(OmniboxResultViewModel* model,
                     int model_index,
                     const gfx::Font& font,
                     const gfx::Font& bold_font);
   virtual ~OmniboxResultView();
 
-  static SkColor GetColor(ResultViewState state, ColorKind kind);
+  static SkColor GetColor(const ui::NativeTheme* theme,
+                          ResultViewState state,
+                          ColorKind kind);
 
   // Updates the match used to paint the contents of this result view. We copy
   // the match so that we can continue to paint the last result even after the
   // model has changed.
   void SetMatch(const AutocompleteMatch& match);
 
   void ShowKeyword(bool show_keyword);
 
   void Invalidate();
 
@@ skipping 30 matching lines @@
     minimum_text_vertical_padding_ = value;
   }
 
  private:
   struct ClassificationData;
   typedef std::vector<ClassificationData> Classifications;
 
   struct RunData;
   typedef std::vector<RunData> Runs;
 
+  // Common initialization code of the colors returned by GetColors().
+  static void CommonInitColors(const ui::NativeTheme* theme,
+                               SkColor colors[][NUM_KINDS]);
+
   // Predicate functions for use when sorting the runs.
   static bool SortRunsLogically(const RunData& lhs, const RunData& rhs);
   static bool SortRunsVisually(const RunData& lhs, const RunData& rhs);
 
   gfx::ImageSkia GetIcon() const;
   const gfx::ImageSkia* GetKeywordIcon() const;
 
   // Elides |runs| to fit in |remaining_width|.  The runs in |runs| should be in
   // logical order.
   //
@@ skipping 46 matching lines @@
 
   gfx::Rect keyword_text_bounds_;
   scoped_ptr<views::ImageView> keyword_icon_;
 
   scoped_ptr<ui::SlideAnimation> animation_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_