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

chrome/browser/toolbar_model.cc

Index: chrome/browser/toolbar_model.cc
===================================================================
--- chrome/browser/toolbar_model.cc	(revision 25504)
+++ chrome/browser/toolbar_model.cc	(working copy)
@@ -106,14 +106,9 @@
   }
 }
 
-void ToolbarModel::GetIconHoverText(std::wstring* text, SkColor* text_color) {
-  static const SkColor kOKHttpsInfoBubbleTextColor =
-      SkColorSetRGB(0, 153, 51);  // Green.
-  static const SkColor kBrokenHttpsInfoBubbleTextColor =
-      SkColorSetRGB(255, 0, 0);  // Red.
+void ToolbarModel::GetIconHoverText(std::wstring* text) {
+  DCHECK(text);
 
-  DCHECK(text && text_color);
-
   NavigationController* navigation_controller = GetNavigationController();
   // We don't expect to be called during initialization, so the controller
   // should never be NULL.
@@ -130,12 +125,10 @@
             SSLErrorInfo::CreateError(SSLErrorInfo::MIXED_CONTENTS,
                                       NULL, GURL::EmptyGURL());
         text->assign(error_info.short_description());
-        *text_color = kBrokenHttpsInfoBubbleTextColor;
       } else {
         DCHECK(entry->url().has_host());
         text->assign(l10n_util::GetStringF(IDS_SECURE_CONNECTION,
                                            UTF8ToWide(entry->url().host())));
-        *text_color = kOKHttpsInfoBubbleTextColor;
       }
       break;
     }
@@ -147,7 +140,6 @@
         NOTREACHED();
         return;
       }
-      *text_color = kBrokenHttpsInfoBubbleTextColor;
       break;
     }
     default:
Property changes on: chrome\browser\toolbar_model.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/chrome/browser/toolbar_model.cc:r25494
   Merged /branches/chrome_webkit_merge_branch/chrome/browser/toolbar_model.cc:r69-2775