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

chrome/browser/toolbar_model.cc

 // Copyright (c) 2006-2008 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/toolbar_model.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
@@ skipping 88 matching lines @@
       return ToolbarModel::WARNING_ICON;
     case SECURITY_STYLE_UNKNOWN:
     case SECURITY_STYLE_UNAUTHENTICATED:
       return ToolbarModel::NO_ICON;
     default:
       NOTREACHED();
       return ToolbarModel::NO_ICON;
   }
 }
 
-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.
-
-  DCHECK(text && text_color);
+void ToolbarModel::GetIconHoverText(std::wstring* text) {
+  DCHECK(text);
 
   NavigationController* navigation_controller = GetNavigationController();
   // We don't expect to be called during initialization, so the controller
   // should never be NULL.
   DCHECK(navigation_controller);
   NavigationEntry* entry = navigation_controller->GetActiveEntry();
   DCHECK(entry);
 
 
   const NavigationEntry::SSLStatus& ssl = entry->ssl();
   switch (ssl.security_style()) {
     case SECURITY_STYLE_AUTHENTICATED: {
       if (ssl.has_mixed_content()) {
         SSLErrorInfo error_info =
             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;
     }
     case SECURITY_STYLE_AUTHENTICATION_BROKEN: {
       CreateErrorText(entry, text);
       if (text->empty()) {
         // If the authentication is broken, we should always have at least one
         // error.
         NOTREACHED();
         return;
       }
-      *text_color = kBrokenHttpsInfoBubbleTextColor;
       break;
     }
     default:
       // Don't show the info bubble in any other cases.
       text->clear();
       break;
   }
 }
 
 ToolbarModel::InfoTextType ToolbarModel::GetInfoText(std::wstring* text,
@@ skipping 49 matching lines @@
     // Multiple errors.
     text->assign(l10n_util::GetString(IDS_SEVERAL_SSL_ERRORS));
     text->append(L"\n");
     for (int i = 0; i < error_count; ++i) {
       text->append(errors[i].short_description());
       if (i != error_count - 1)
         text->append(L"\n");
     }
   }
 }