Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 337 matching lines @@
       return color_utils::AlphaBlend(GetColor(TEXT), GetColor(BACKGROUND), 128);
 
     case SECURITY_CHIP_TEXT:
       return GetSecureTextColor(GetToolbarModel()->GetSecurityLevel(false));
   }
   NOTREACHED();
   return gfx::kPlaceholderColor;
 }
 
 SkColor LocationBarView::GetSecureTextColor(
-    security_state::SecurityStateModel::SecurityLevel security_level) const {
-  if (security_level ==
-      security_state::SecurityStateModel::SECURE_WITH_POLICY_INSTALLED_CERT) {
+    security_state::SecurityLevel security_level) const {
+  if (security_level == security_state::SECURE_WITH_POLICY_INSTALLED_CERT) {
     return GetColor(DEEMPHASIZED_TEXT);
   }
 
   SkColor text_color = GetColor(TEXT);
   if (!color_utils::IsDark(GetColor(BACKGROUND))) {
-    if ((security_level == security_state::SecurityStateModel::EV_SECURE) ||
-        (security_level == security_state::SecurityStateModel::SECURE)) {
+    if ((security_level == security_state::EV_SECURE) ||
+        (security_level == security_state::SECURE)) {
       text_color = gfx::kGoogleGreen700;
-    } else if (security_level ==
-               security_state::SecurityStateModel::DANGEROUS) {
+    } else if (security_level == security_state::DANGEROUS) {
       text_color = gfx::kGoogleRed700;
     }
   }
   return color_utils::GetReadableColor(text_color, GetColor(BACKGROUND));
 }
 
 void LocationBarView::ZoomChangedForActiveTab(bool can_show_bubble) {
   DCHECK(zoom_view_);
   if (RefreshZoomView()) {
     Layout();
@@ skipping 444 matching lines @@
   return GetLayoutConstant(LOCATION_BAR_BORDER_THICKNESS) +
          GetLayoutConstant(LOCATION_BAR_VERTICAL_PADDING);
 }
 
 void LocationBarView::RefreshLocationIcon() {
   // |omnibox_view_| may not be ready yet if Init() has not been called. The
   // icon will be set soon by OnChanged().
   if (!omnibox_view_)
     return;
 
-  security_state::SecurityStateModel::SecurityLevel security_level =
+  security_state::SecurityLevel security_level =
       GetToolbarModel()->GetSecurityLevel(false);
-  SkColor icon_color =
-      (security_level == security_state::SecurityStateModel::NONE ||
-       security_level == security_state::SecurityStateModel::HTTP_SHOW_WARNING)
-          ? color_utils::DeriveDefaultIconColor(GetColor(TEXT))
-          : GetSecureTextColor(security_level);
+  SkColor icon_color = (security_level == security_state::NONE ||
+                        security_level == security_state::HTTP_SHOW_WARNING)
+                           ? color_utils::DeriveDefaultIconColor(GetColor(TEXT))
+                           : GetSecureTextColor(security_level);
   location_icon_view_->SetImage(gfx::CreateVectorIcon(
       omnibox_view_->GetVectorIcon(), kIconWidth, icon_color));
 }
 
 bool LocationBarView::RefreshContentSettingViews() {
   bool visibility_changed = false;
   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i) {
     const bool was_visible = (*i)->visible();
     (*i)->Update(GetToolbarModel()->input_in_progress() ? nullptr
@@ skipping 148 matching lines @@
     FirstRunBubble::ShowBubble(browser, location_icon_view_);
 #endif
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_->visible() &&
       !suggested_text_view_->size().IsEmpty();
 }
 
 base::string16 LocationBarView::GetSecurityText() const {
-  bool has_ev_cert = (GetToolbarModel()->GetSecurityLevel(false) ==
-                      security_state::SecurityStateModel::EV_SECURE);
+  bool has_ev_cert =
+      (GetToolbarModel()->GetSecurityLevel(false) == security_state::EV_SECURE);
   return has_ev_cert ? GetToolbarModel()->GetEVCertName()
                      : GetToolbarModel()->GetSecureVerboseText();
 }
 
 bool LocationBarView::ShouldShowKeywordBubble() const {
   return !omnibox_view_->model()->keyword().empty() &&
       !omnibox_view_->model()->is_keyword_hint();
 }
 
 bool LocationBarView::ShouldShowSecurityChip() const {
-  using SecurityLevel = security_state::SecurityStateModel::SecurityLevel;
+  using SecurityLevel = security_state::SecurityLevel;
   const SecurityLevel level = GetToolbarModel()->GetSecurityLevel(false);
   if (level == SecurityLevel::EV_SECURE) {
     return true;
   } else if (level == SecurityLevel::SECURE) {
     return should_show_secure_state_;
   } else {
     return should_show_nonsecure_state_ &&
            (level == SecurityLevel::DANGEROUS ||
             level == SecurityLevel::HTTP_SHOW_WARNING);
   }
 }
 
 bool LocationBarView::ShouldAnimateSecurityChip() const {
-  using SecurityLevel = security_state::SecurityStateModel::SecurityLevel;
+  using SecurityLevel = security_state::SecurityLevel;
   SecurityLevel level = GetToolbarModel()->GetSecurityLevel(false);
   if (!ShouldShowSecurityChip())
     return false;
   if (level == SecurityLevel::SECURE || level == SecurityLevel::EV_SECURE)
     return should_animate_secure_state_;
   return should_animate_nonsecure_state_ &&
          (level == SecurityLevel::DANGEROUS ||
           level == SecurityLevel::HTTP_SHOW_WARNING);
 }
 
@@ skipping 304 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = nullptr;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }