Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/views/omnibox/omnibox_view_views.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/omnibox/omnibox_view_views.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 98 matching lines @@
                                    Profile* profile,
                                    CommandUpdater* command_updater,
                                    bool popup_window_mode,
                                    LocationBarView* location_bar,
                                    const gfx::FontList& font_list)
     : OmniboxView(
           controller,
           base::WrapUnique(new ChromeOmniboxClient(controller, profile))),
       profile_(profile),
       popup_window_mode_(popup_window_mode),
-      security_level_(security_state::SecurityStateModel::NONE),
+      security_level_(security_state::NONE),
       saved_selection_for_focus_change_(gfx::Range::InvalidRange()),
       ime_composing_before_change_(false),
       delete_at_end_pressed_(false),
       location_bar_view_(location_bar),
       ime_candidate_window_open_(false),
       select_all_on_mouse_release_(false),
       select_all_on_gesture_tap_(false),
       weak_ptr_factory_(this) {
   set_id(VIEW_ID_OMNIBOX);
   SetFontList(font_list);
@@ skipping 63 matching lines @@
 
   // TODO(msw|oshima): Consider saving/restoring edit history.
   ClearEditHistory();
 }
 
 void OmniboxViewViews::ResetTabState(content::WebContents* web_contents) {
   web_contents->SetUserData(OmniboxState::kKey, nullptr);
 }
 
 void OmniboxViewViews::Update() {
-  const security_state::SecurityStateModel::SecurityLevel old_security_level =
-      security_level_;
+  const security_state::SecurityLevel old_security_level = security_level_;
   UpdateSecurityLevel();
   if (model()->UpdatePermanentText()) {
     // Select all the new text if the user had all the old text selected, or if
     // there was no previous text (for new tab page URL replacement extensions).
     // This makes one particular case better: the user clicks in the box to
     // change it right before the permanent URL is changed.  Since the new URL
     // is still fully selected, the user's typing will replace the edit contents
     // as they'd intended.
     const bool was_select_all = IsSelectAll();
     const bool was_reversed = GetSelectedRange().is_reversed();
@@ skipping 402 matching lines @@
                gfx::Range(host.begin, host.end()));
   }
 
   // Emphasize the scheme for security UI display purposes (if necessary).
   // Note that we check CurrentTextIsURL() because if we're replacing search
   // URLs with search terms, we may have a non-URL even when the user is not
   // editing; and in some cases, e.g. for "site:foo.com" searches, the parser
   // may have incorrectly identified a qualifier as a scheme.
   SetStyle(gfx::DIAGONAL_STRIKE, false);
   if (!model()->user_input_in_progress() && text_is_url &&
-      scheme.is_nonempty() &&
-      (security_level_ != security_state::SecurityStateModel::NONE)) {
+      scheme.is_nonempty() && (security_level_ != security_state::NONE)) {
     SkColor security_color =
         location_bar_view_->GetSecureTextColor(security_level_);
-    const bool strike =
-        (security_level_ == security_state::SecurityStateModel::DANGEROUS);
+    const bool strike = (security_level_ == security_state::DANGEROUS);
     const gfx::Range scheme_range(scheme.begin, scheme.end());
     ApplyColor(security_color, scheme_range);
     ApplyStyle(gfx::DIAGONAL_STRIKE, strike, scheme_range);
   }
 }
 
 bool OmniboxViewViews::IsItemForCommandIdDynamic(int command_id) const {
   return command_id == IDS_PASTE_AND_GO;
 }
 
@@ skipping 441 matching lines @@
       paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO);
 
   menu_contents->AddSeparator(ui::NORMAL_SEPARATOR);
 
   // Minor note: We use IDC_ for command id here while the underlying textfield
   // is using IDS_ for all its command ids. This is because views cannot depend
   // on IDC_ for now.
   menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
       IDS_EDIT_SEARCH_ENGINES);
 }