Implement {Start,Stop}CapturingKeyStrokes for Instant.

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // Copyright 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/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 52 matching lines @@
 using content::UserMetricsAction;
 using predictors::AutocompleteActionPredictor;
 using predictors::AutocompleteActionPredictorFactory;
 
 ///////////////////////////////////////////////////////////////////////////////
 // OmniboxEditModel::State
 
 OmniboxEditModel::State::State(bool user_input_in_progress,
                                const string16& user_text,
                                const string16& keyword,
-                               bool is_keyword_hint)
+                               bool is_keyword_hint,
+                               bool is_focus_visible)
     : user_input_in_progress(user_input_in_progress),
       user_text(user_text),
       keyword(keyword),
-      is_keyword_hint(is_keyword_hint) {
+      is_keyword_hint(is_keyword_hint),
+      is_focus_visible(is_focus_visible) {
 }
 
 OmniboxEditModel::State::~State() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OmniboxEditModel
 
 OmniboxEditModel::OmniboxEditModel(OmniboxView* view,
                                    OmniboxEditController* controller,
                                    Profile* profile)
     : view_(view),
       popup_(NULL),
       controller_(controller),
       has_focus_(false),
+      is_focus_visible_(true),
       user_input_in_progress_(false),
       just_deleted_text_(false),
       has_temporary_text_(false),
       is_temporary_text_set_by_instant_(false),
       paste_state_(NONE),
       control_key_state_(UP),
       is_keyword_hint_(false),
       profile_(profile),
       in_revert_(false),
       allow_exact_keyword_match_(false) {
@@ skipping 18 matching lines @@
     // on switching back, typing will "just work").
     const string16 user_text(UserTextFromDisplayText(view_->GetText()));
     if (user_text.empty()) {
       view_->RevertAll();
       view_->SelectAll(true);
     } else {
       InternalSetUserText(user_text);
     }
   }
 
-  return State(user_input_in_progress_, user_text_, keyword_, is_keyword_hint_);
+  return State(user_input_in_progress_, user_text_, keyword_, is_keyword_hint_,
+               is_focus_visible_);
 }
 
 void OmniboxEditModel::RestoreState(const State& state) {
+  SetFocusVisibility(state.is_focus_visible);
   // Restore any user editing.
   if (state.user_input_in_progress) {
     // NOTE: Be sure and set keyword-related state BEFORE invoking
     // DisplayTextFromUserText(), as its result depends upon this state.
     keyword_ = state.keyword;
     is_keyword_hint_ = state.is_keyword_hint;
     view_->SetUserText(state.user_text,
         DisplayTextFromUserText(state.user_text), false);
   }
 }
@@ skipping 580 matching lines @@
     // that we avoid PermanentURL() here because it's not guaranteed to give us
     // the actual underlying current URL, e.g. if we're on the NTP and the
     // |permanent_text_| is empty.
     autocomplete_controller_->StartZeroSuggest(web_contents->GetURL(),
                                                user_text_);
   }
 
   NotifySearchTabHelper();
 }
 
+void OmniboxEditModel::SetFocusVisibility(bool visible) {
+  if (visible != is_focus_visible_) {
+    is_focus_visible_ = visible;
+    view_->ApplyFocusVisibility();
+  }
+}
+
 void OmniboxEditModel::OnWillKillFocus(gfx::NativeView view_gaining_focus) {
   SetInstantSuggestion(InstantSuggestion());
 
   if (InstantController* instant = controller_->GetInstant())
     instant->OmniboxLostFocus(view_gaining_focus);
 
   // TODO(jered): Rip this out along with StartZeroSuggest.
   autocomplete_controller_->StopZeroSuggest();
   NotifySearchTabHelper();
 }
 
 void OmniboxEditModel::OnKillFocus() {
   has_focus_ = false;
+  is_focus_visible_ = true;

[Peter Kasting, 2012/12/04 02:00:52]

I'm a little confused about the distinction between setting focus to visible
here in OmniboxEditModel::OnKillFocus() versus setting it in
OmniboxViewViews::SetFocus().  Does OmniboxViewViews::SetFocus() call through to
OmniboxEditModel::OnSetFocus() eventually?  If so, should the change to focus
visibility be moved from the view to that function in the edit?  

Basically, the core question here is about why we don't have parallel structure.

[samarth, 2012/12/04 04:55:35]

So the call in SetFocus can't be moved to OnSetFocus.  The latter is only
triggered by focus change from the underlying textfield.  So for example, if you
have a tab open with invisible focus and then open a second tab, this will
trigger calls to SetFocus but not to OnSetFocus.

But you're right. we should make this parallel and so I moved the reseting of
is_caret_visible to HandleFocusOut in the view.

   control_key_state_ = UP;
   paste_state_ = NONE;
 }
 
 bool OmniboxEditModel::OnEscapeKeyPressed() {
   if (has_temporary_text_) {
     AutocompleteMatch match;
     InfoForCurrentSelection(&match, NULL);
     if (match.destination_url != original_url_) {
       RevertTemporaryText(true);
@@ skipping 513 matching lines @@
 }
 
 void OmniboxEditModel::ClassifyStringForPasteAndGo(
     const string16& text,
     AutocompleteMatch* match,
     GURL* alternate_nav_url) const {
   DCHECK(match);
   AutocompleteClassifierFactory::GetForProfile(profile_)->Classify(text,
       string16(), false, false, match, alternate_nav_url);
 }