Re-instate the temporary revert from r45267. That reverted certain

Omnibox, toolbar, tab animations, and other UI changes for purposes of
testing and merging into mstone-5.

Additionally reverts these CLs to fix the earlier revert:
r45271: [Mac] Image references missing from Omnibox revert.
r45268: GTK fix merge failure in uber-revert.

Additional revert which fixed a bug for the branch:
r45381: [Mac] Omnibox popup icons and text lined up under toolbar.

Slight merge conflict which should be good:
r45322: GTK: Implement OnDragCanceled() for autocomplete...

Also ++kThemePackVersion and regenerate the cached theme pak.

Re-instated changes:
r45213: GTK: Override cursor colors in chrome-theme mode.
r45103: Support drawing nano tabs in the tabstrip.
r45084: GTK: Position the EV certificate stuff inside a green bubble.
r44979: Subclassing the InfoBubble to handle anchoring bubbles basedon...
r44957: GTK: Tint the geolocation icons in gtk mode.
r44943: Changes FormatURL to not strip http if the host starts with ft...
r44930: Remove an icon that is no longer used.
r44929: SSL UI changes, Windows, code side (images are separate).
r44859: SSL UI changes (icons).  TBRed since trybots hate binary patches.
r44822: GTK: Select better greens in the native omnibox popup.
r44814: GTK: navigate to URL on PRIMARY when middle-clicking the locat...
r44789: [Mac] Bookmark star missing on NTP and BMM.
r44775: [Mac] Centralize hack to make tests work with AutocompleteClas...
r44678: Display the SECURITY_WARNING status in the location bar for the
r44648: [Mac] Add an arrow cursor rect for the location image.
r44615: Revert r44611 because it may have broken "unit_tests" on "Vist...
r44611: Display the SECURITY_WARNING status in the location bar for the
r44577: Revert 44572 - [Mac] Update locationbar icon as user types.
r44572: [Mac] Update location-bar icon as user types.
r44555: GTK: Use correct button mask on reload button.
r44545: [Mac] Omnibox text drag drag URL when select-all.
r44523: GTK: Prevent inappropriate drag of location bar location icon.
r44519: GTK: make the primary selection include the url's scheme when ...
r44492: [Mac] Fix search icon in keyword search to be right-side-up.
r44415: GTK: Update top padding on icons in the autocomplete popup.
r44401: GTK: Tint omnibox icons in GTK mode differently.
r44380: GTK: Move reload in gtk mode and fix omnibox popup location.
r44282: Fixes crash in autocomplete when typing some URLs. The problem
r44273: [Mac] PDF icons for omnibox nits.
r44269: Fix build break due to bad merge resolve
r44268: Shift omnibox dropdown in and up on Windows, and square off th...
r44178: GTK: fix TTS padding.
r44177: Round the top left and right edges of the toolbar.
r44171: Images only checkin for try server goodness.
r44163: GTK: fix padding of autocomplete popup.
r44152: [Mac] PDF icons for omnibox.
r44145: GTK: Theme the icons in the location bar and use GTK colors fo...
r44140: Strips http from the omnibox
r44131: Fixes bugs in new tab strip animations where they weren't doin...
r44116: Change the default theme colors.
r44117: Add newline to EOF to fix CrOS builder.
r44115: Make the bottom edges of the opaque frame rounded.
r44091: [Mac] No star icon or page actions in omnibox on popups.
r44087: Don't allow drag or click on location icon when editing in omn...
r44021: [GTK] Add TTS lens graphic to linux TTS box.
r44008: [Mac] Tweak location icon spacing in omnibox.
r43977: GTK: don't show the star or page actions in ShouldOnlyShowLoca...
r43972: Make the firstrun bubble point at a better spot now that the l...
r43971: [Mac] Location icon in omnibox as drag source.
r43970: Make the star and page action icons not appear on popup windows.
r43954: Fixes bug in TabStrip where dragging tab out then back in rapidly
r43864: Tweaks to BoundsAnimator/SlideAnimation and TabStrip:
r43787: Allow location icon to be dragged & dropped.  This also fixes ...
r43759: Changes end cap of tab-to-search images.
r43740: Change bookmark bar toggle to ctrl-shift-b.
r43723: Show Page Info dialog on mouse up, not mouse down.
r43677: Fix Mac build failure.
r43676: Replace omnibox icons with new set that are all the same size ...
r43596: Fix browser test TestStarButtonAccObj.
r43593: Disables TestStarButtonAccObj.
r43582: Changes tab strip to use BoundsAnimator for tab strip animatio...
r43563: GTK: don't show reload button for popup/app windows.
r43562: Star/reload shuffle, Windows version.
r43540: [Mac] Magnifying glass in keyword-search bubble.
r43482: Adds images needed for new tab animation. I'm separating this ...
r43422: Add reload mask resource.
r43392: GTK: make the location icon a drag source.
r43376: [Mac] Move star button into page-actions area of omnibox.
r43357: [Mac] Line up omnibox popup under field.
r43290: gtk: fix display of icons in omnibox popup
r43269: GTK: fix reload button.
r43249: [Mac] Rearrange SSL status icon/label in omnibox.
r43248: BrowserThemePack: Adds persistant ids for the reload endcaps.
r43241: GTK: more location bar updates.
r43191: Fix memory leak in BrowserThemePack.
r43154: GTK: set the new star button's ID
r43151: Fix bad conflict resolution for r43146.
r43146: GTK: toolbar reload/star shuffle.
r43025: Show the location bar icon (almost) all the time, and have its...
r43023: Add new images for new reload button. No code change.
r42782: Remove this icon, now that it's no longer used (due to my secu...
r42502: Omnibox M5 work, part 1: Security changes
r42245: Check in new icons for omnibox security changes alone, so that...

BUG=none
TEST=People go back to complaining about missing http://.
R=pkasting@chromium.org,beng@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45474 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 40 insertions, 148 deletions

diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc
index c651e3d..c641539 100644
--- a/chrome/browser/toolbar_model.cc
+++ b/chrome/browser/toolbar_model.cc
@@ -17,6 +17,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/net_util.h"
 
@@ -38,7 +39,6 @@ std::wstring ToolbarModel::GetText() const {
     languages = navigation_controller->profile()->GetPrefs()->GetString(
                     prefs::kAcceptLanguages);
     NavigationEntry* entry = navigation_controller->GetActiveEntry();
-    // We may not have a navigation entry yet
     if (!navigation_controller->tab_contents()->ShouldDisplayURL()) {
       // Explicitly hide the URL for this tab.
       url = GURL();
@@ -53,144 +53,70 @@ std::wstring ToolbarModel::GetText() const {
       url = GURL(url.scheme() + ":");
     }
   }
-  return net::FormatUrl(url, languages, true, UnescapeRule::NORMAL, NULL, NULL,
-                        NULL);
+  return net::FormatUrl(url, languages, net::kFormatUrlOmitAll,
+                        UnescapeRule::NORMAL, NULL, NULL, NULL);
 }
 
 ToolbarModel::SecurityLevel ToolbarModel::GetSecurityLevel() const {
   if (input_in_progress_)  // When editing, assume no security style.
-    return ToolbarModel::NORMAL;
+    return NONE;
 
   NavigationController* navigation_controller = GetNavigationController();
   if (!navigation_controller)  // We might not have a controller on init.
-    return ToolbarModel::NORMAL;
+    return NONE;
 
   NavigationEntry* entry = navigation_controller->GetActiveEntry();
   if (!entry)
-    return ToolbarModel::NORMAL;
+    return NONE;
 
-  switch (entry->ssl().security_style()) {
-    case SECURITY_STYLE_AUTHENTICATED:
-      if (entry->ssl().has_mixed_content())
-        return ToolbarModel::NORMAL;
-      return ToolbarModel::SECURE;
-    case SECURITY_STYLE_AUTHENTICATION_BROKEN:
-      return ToolbarModel::INSECURE;
+  const NavigationEntry::SSLStatus& ssl = entry->ssl();
+  switch (ssl.security_style()) {
     case SECURITY_STYLE_UNKNOWN:
     case SECURITY_STYLE_UNAUTHENTICATED:
-      return ToolbarModel::NORMAL;
-    default:
-      NOTREACHED();
-      return ToolbarModel::NORMAL;
-  }
-}
-
-ToolbarModel::SecurityLevel ToolbarModel::GetSchemeSecurityLevel() const {
-  // For now, in sync with the security level.
-  return GetSecurityLevel();
-}
-
-ToolbarModel::Icon ToolbarModel::GetIcon() const {
-  if (input_in_progress_)
-    return ToolbarModel::NO_ICON;
-
-  NavigationController* navigation_controller = GetNavigationController();
-  if (!navigation_controller)  // We might not have a controller on init.
-    return ToolbarModel::NO_ICON;
+      return NONE;
 
-  NavigationEntry* entry = navigation_controller->GetActiveEntry();
-  if (!entry)
-    return ToolbarModel::NO_ICON;
+    case SECURITY_STYLE_AUTHENTICATION_BROKEN:
+      return SECURITY_ERROR;
 
-  const NavigationEntry::SSLStatus& ssl = entry->ssl();
-  switch (ssl.security_style()) {
     case SECURITY_STYLE_AUTHENTICATED:
       if (ssl.has_mixed_content())
-        return ToolbarModel::WARNING_ICON;
-      return ToolbarModel::LOCK_ICON;
-    case SECURITY_STYLE_AUTHENTICATION_BROKEN:
-      return ToolbarModel::WARNING_ICON;
-    case SECURITY_STYLE_UNKNOWN:
-    case SECURITY_STYLE_UNAUTHENTICATED:
-      return ToolbarModel::NO_ICON;
+        return SECURITY_WARNING;
+      if (net::IsCertStatusError(ssl.cert_status())) {
+        DCHECK_EQ(ssl.cert_status() & net::CERT_STATUS_ALL_ERRORS,
+                  net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION);
+        return SECURITY_WARNING;
+      }
+      if ((ssl.cert_status() & net::CERT_STATUS_IS_EV) &&
+          CertStore::GetSharedInstance()->RetrieveCert(ssl.cert_id(), NULL))
+        return EV_SECURE;
+      return SECURE;
+
     default:
       NOTREACHED();
-      return ToolbarModel::NO_ICON;
+      return NONE;
   }
 }
 
-void ToolbarModel::GetIconHoverText(std::wstring* text) const {
-  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());
-        text->assign(error_info.short_description());
-      } else {
-        DCHECK(entry->url().has_host());
-        text->assign(l10n_util::GetStringF(IDS_SECURE_CONNECTION,
-                                           UTF8ToWide(entry->url().host())));
-      }
-      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;
-      }
-      break;
-    }
-    default:
-      // Don't show the info bubble in any other cases.
-      text->clear();
-      break;
-  }
+int ToolbarModel::GetIcon() const {
+  static int icon_ids[NUM_SECURITY_LEVELS] = {
+    IDR_OMNIBOX_HTTP,
+    IDR_OMNIBOX_HTTPS_VALID,
+    IDR_OMNIBOX_HTTPS_VALID,
+    IDR_OMNIBOX_HTTPS_WARNING,
+    IDR_OMNIBOX_HTTPS_INVALID,
+  };
+  DCHECK(arraysize(icon_ids) == NUM_SECURITY_LEVELS);
+  return icon_ids[GetSecurityLevel()];
 }
 
-ToolbarModel::InfoTextType ToolbarModel::GetInfoText(
-    std::wstring* text,
-    std::wstring* tooltip) const {
-  DCHECK(text && tooltip);
-  text->clear();
-  tooltip->clear();
-
-  if (input_in_progress_)
-    return INFO_NO_INFO;
-
-  NavigationController* navigation_controller = GetNavigationController();
-  if (!navigation_controller)  // We might not have a controller on init.
-    return INFO_NO_INFO;
-
-  NavigationEntry* entry = navigation_controller->GetActiveEntry();
-  const NavigationEntry::SSLStatus& ssl = entry->ssl();
-  if (!entry || ssl.has_mixed_content() ||
-      net::IsCertStatusError(ssl.cert_status()) ||
-      ((ssl.cert_status() & net::CERT_STATUS_IS_EV) == 0))
-    return INFO_NO_INFO;
-
+std::wstring ToolbarModel::GetEVCertName() const {
+  DCHECK_EQ(GetSecurityLevel(), EV_SECURE);
   scoped_refptr<net::X509Certificate> cert;
-  CertStore::GetSharedInstance()->RetrieveCert(ssl.cert_id(), &cert);
-  if (!cert.get()) {
-    NOTREACHED();
-    return INFO_NO_INFO;
-  }
-
-  SSLManager::GetEVCertNames(*cert, text, tooltip);
-  return INFO_EV_TEXT;
+  // Note: Navigation controller and active entry are guaranteed non-NULL or
+  // the security level would be NONE.
+  CertStore::GetSharedInstance()->RetrieveCert(
+      GetNavigationController()->GetActiveEntry()->ssl().cert_id(), &cert);
+  return SSLManager::GetEVCertName(*cert);
 }
 
 NavigationController* ToolbarModel::GetNavigationController() const {
@@ -200,37 +126,3 @@ NavigationController* ToolbarModel::GetNavigationController() const {
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }
-
-void ToolbarModel::CreateErrorText(NavigationEntry* entry,
-                                   std::wstring* text) const {
-  const NavigationEntry::SSLStatus& ssl = entry->ssl();
-  std::vector<SSLErrorInfo> errors;
-  SSLErrorInfo::GetErrorsForCertStatus(ssl.cert_id(),
-                                       ssl.cert_status(),
-                                       entry->url(),
-                                       &errors);
-  if (ssl.has_mixed_content()) {
-    errors.push_back(SSLErrorInfo::CreateError(SSLErrorInfo::MIXED_CONTENTS,
-                                               NULL, GURL()));
-  }
-  if (ssl.has_unsafe_content()) {
-    errors.push_back(SSLErrorInfo::CreateError(SSLErrorInfo::UNSAFE_CONTENTS,
-                                               NULL, GURL()));
-  }
-
-  int error_count = static_cast<int>(errors.size());
-  if (error_count == 0) {
-    text->assign(L"");
-  } else if (error_count == 1) {
-    text->assign(errors[0].short_description());
-  } else {
-    // 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");
-    }
-  }
-}