Merge 25494 - Use system themes where possible in Omnibox edit and dropdown; ...

chrome/browser/views/location_bar_view.h

Index: chrome/browser/views/location_bar_view.h
===================================================================
--- chrome/browser/views/location_bar_view.h	(revision 25504)
+++ chrome/browser/views/location_bar_view.h	(working copy)
@@ -56,6 +56,17 @@
     virtual void OnInputInProgress(bool in_progress) = 0;
   };
 
+  enum ColorKind {
+    BACKGROUND = 0,
+    TEXT,
+    SELECTED_TEXT,
+    DEEMPHASIZED_TEXT,
+    SECURITY_TEXT,
+    SECURITY_INFO_BUBBLE_TEXT,
+    SCHEME_STRIKEOUT,
+    NUM_KINDS
+  };
+
   LocationBarView(Profile* profile,
                   CommandUpdater* command_updater,
                   ToolbarModel* model,
@@ -70,6 +81,10 @@
   // only be called when the receiving instance is attached to a view container.
   bool IsInitialized() const;
 
+  // Returns the appropriate color for the desired kind, based on the user's
+  // system theme.
+  static SkColor GetColor(bool is_secure, ColorKind kind);
+
   // Updates the location bar.  We also reset the bar's permanent text and
   // security style, and, if |tab_for_state_restoring| is non-NULL, also restore
   // saved state that the tab holds.
@@ -139,7 +154,6 @@
   virtual int PageActionVisibleCount();
 
   static const int kVertMargin;
-  static const SkColor kBackgroundColorByLevel[];
 
  protected:
   void Focus();
Property changes on: chrome\browser\views\location_bar_view.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/views/location_bar_view.h:r25494