Save/restore views omnibox selection on blur/focus, select all on click focus.

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 "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 201 matching lines @@
 void OmniboxViewViews::GetAccessibleState(ui::AccessibleViewState* state) {
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION);
 }
 
 void OmniboxViewViews::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   if (popup_view_->IsOpen())
     popup_view_->UpdatePopupAppearance();
 }
 
 bool OmniboxViewViews::OnMousePressed(const ui::MouseEvent& event) {
-  const bool result = views::Textfield::OnMousePressed(event);
   select_all_on_mouse_release_ =
       (event.IsOnlyLeftMouseButton() || event.IsOnlyRightMouseButton()) &&
       (!HasFocus() || (model()->focus_state() == OMNIBOX_FOCUS_INVISIBLE));
   // Restore caret visibility whenever the user clicks in the omnibox in a way
   // that would give it focus.  We must handle this case separately here because
   // if the omnibox currently has invisible focus, the mouse event won't trigger
   // either SetFocus() or OmniboxEditModel::OnSetFocus().
   if (select_all_on_mouse_release_)
     model()->SetCaretVisibility(true);
-  return result;
+  return views::Textfield::OnMousePressed(event);

[Peter Kasting, 2013/02/19 01:56:24]

Does this need a comment about why it's important to call SetCaretVisibility()
first?

[msw, 2013/02/19 02:14:11]

AFAICT the order doesn't matter, I just switched it for code cleanup.

 }
 
 bool OmniboxViewViews::OnMouseDragged(const ui::MouseEvent& event) {
   select_all_on_mouse_release_ = false;
   return views::Textfield::OnMouseDragged(event);
 }
 
 void OmniboxViewViews::OnMouseReleased(const ui::MouseEvent& event) {
   views::Textfield::OnMouseReleased(event);
   if ((event.IsOnlyLeftMouseButton() || event.IsOnlyRightMouseButton()) &&
       select_all_on_mouse_release_) {
-    // Select all in the reverse direction so as not to scroll the caret
-    // into view and shift the contents jarringly.

[Peter Kasting, 2013/02/19 01:56:24]

Why delete this comment?

[msw, 2013/02/19 02:14:11]

I restored it (I thought it might be unnecessary, but don't really care).

     SelectAll(true);
   }
   select_all_on_mouse_release_ = false;
 }
 
 bool OmniboxViewViews::OnKeyPressed(const ui::KeyEvent& event) {
   // Use our own implementation of paste. See OnPaste() for details.
   if (!read_only() && event.IsControlDown() &&
       event.key_code() == ui::VKEY_V) {
     OnBeforePossibleChange();
     OnPaste();
     OnAfterPossibleChange();
     return true;
   }
+
   bool handled = views::Textfield::OnKeyPressed(event);
-
   if (event.key_code() == ui::VKEY_RETURN) {
     bool alt_held = event.IsAltDown();
     model()->AcceptInput(alt_held ? NEW_FOREGROUND_TAB : CURRENT_TAB, false);
     handled = true;
   } else if (!handled && event.key_code() == ui::VKEY_ESCAPE) {
     // Let the model handle the Escape key or continue its propagation.
     handled = model()->OnEscapeKeyPressed();
   } else if (event.key_code() == ui::VKEY_CONTROL) {
     // Omnibox2 can switch its contents while pressing a control key. To switch
     // the contents of omnibox2, we notify the OmniboxEditModel class when the
@@ skipping 19 matching lines @@
       handled = model()->AcceptKeyword();
     } else if (model()->popup_model()->IsOpen()) {
       if (event.IsShiftDown() &&
           model()->popup_model()->selected_line_state() ==
               OmniboxPopupModel::KEYWORD) {
         model()->ClearKeyword(text());
       } else {
         model()->OnUpOrDownKeyPressed(event.IsShiftDown() ? -1 : 1);
       }
       handled = true;
-    } else {
-      string16::size_type start = 0;
-      string16::size_type end = 0;
-      const size_t length = text().length();
-      GetSelectionBounds(&start, &end);
-      if (start != end || start < length) {
-        OnBeforePossibleChange();
-        SelectRange(ui::Range(length, length));
-        OnAfterPossibleChange();
-        handled = true;
-      }
-
-      // TODO(msw|oshima): Handle Instant.
     }
   }
-  // TODO(msw|oshima): Handle page up and page down.
-
+  // TODO(msw): Handle Instant, tab through popup, tab to search, page up/down.
   return handled;
 }
 
 bool OmniboxViewViews::OnKeyReleased(const ui::KeyEvent& event) {
   // Omnibox2 can switch its contents while pressing a control key. To switch
   // the contents of omnibox2, we notify the OmniboxEditModel class when the
   // control-key state is changed.
   if (event.key_code() == ui::VKEY_CONTROL) {
     // TODO(oshima): investigate if we need to support keyboard with two
     // controls.
     model()->OnControlKeyChanged(false);
     return true;
   }
   return false;
 }
 
 void OmniboxViewViews::OnFocus() {
   views::Textfield::OnFocus();
   // TODO(oshima): Get control key state.
   model()->OnSetFocus(false);
-  // Don't call controller()->OnSetFocus as this view has already
-  // acquired the focus.
+  // Don't call controller()->OnSetFocus, this view has already acquired focus.
+
+  // Restore a valid saved selection on tab-to-focus.
+  if (saved_temporary_selection_.IsValid() && !select_all_on_mouse_release_)
+    SelectRange(saved_temporary_selection_);
 }
 
 void OmniboxViewViews::OnBlur() {
+  // Save the selection to restore on tab-to-focus.
+  GetSelectedRange(&saved_temporary_selection_);
+
   views::Textfield::OnBlur();
   gfx::NativeView native_view = NULL;
 #if defined(USE_AURA)
   views::Widget* widget = GetWidget();
   if (widget) {
     aura::client::FocusClient* client =
         aura::client::GetFocusClient(widget->GetNativeView());
     if (client)
       native_view = client->GetFocusedWindow();
   }
@@ skipping 511 matching lines @@
   const string16 text(GetClipboardText());
   if (!text.empty()) {
     // Record this paste, so we can do different behavior.
     model()->on_paste();
     // Force a Paste operation to trigger the text_changed code in
     // OnAfterPossibleChange(), even if identical contents are pasted.
     text_before_change_.clear();
     ReplaceSelection(text);
   }
 }