Consolidate Omnibox ViewState and AutocompleteEditState, rename.

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 21 matching lines @@
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
-#include "ui/gfx/render_text.h"
+#include "ui/gfx/selection_model.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/layer.h"
 #endif
 
-using content::WebContents;
-
 namespace {
 
 // Stores omnibox state for each tab.
-struct ViewState {
-  explicit ViewState(const gfx::SelectionModel& selection_model)
-      : selection_model(selection_model) {
-  }
+struct OmniboxState : public base::SupportsUserData::Data {
+  static const char kKey[];
 
-  // SelectionModel of selected text.
-  gfx::SelectionModel selection_model;
+  OmniboxState(const OmniboxEditModel::State& model_state,
+               const gfx::SelectionModel& selection_model);
+  virtual ~OmniboxState();
+
+  const OmniboxEditModel::State model_state;
+  const gfx::SelectionModel selection_model;
 };
 
-const char kAutocompleteEditStateKey[] = "AutocompleteEditState";
+// static
+const char OmniboxState::kKey[] = "OmniboxState";
 
-struct AutocompleteEditState : public base::SupportsUserData::Data {
-  AutocompleteEditState(const OmniboxEditModel::State& model_state,
-                        const ViewState& view_state)
-      : model_state(model_state),
-        view_state(view_state) {
-  }
-  virtual ~AutocompleteEditState() {}
+OmniboxState::OmniboxState(const OmniboxEditModel::State& model_state,
+                           const gfx::SelectionModel& selection_model)
+    : model_state(model_state),
+      selection_model(selection_model) {
+}
 
-  const OmniboxEditModel::State model_state;
-  const ViewState view_state;
-};
+OmniboxState::~OmniboxState() {}
 
 // The following const value is the same as in browser_defaults.
 const int kAutocompleteEditFontPixelSize = 15;
 // Font size 10px (as defined in browser_defaults) is too small for many
 // non-Latin/Greek/Cyrillic (non-LGC) scripts. For pop-up window, the total
 // rectangle is 21px tall and the height available for "ink" is 17px (please
 // refer to kAutocompleteVerticalMarginInPopup). With 12px font size, the
 // tallest glyphs in UI fonts we're building for ChromeOS (across all scripts)
 // still fit within 17px "ink" height.
 const int kAutocompleteEditFontPixelSizeInPopup = 12;
@@ skipping 262 matching lines @@
   // Close the popup.
   CloseOmniboxPopup();
   // Tell the model to reset itself.
   model()->OnKillFocus();
   controller()->OnKillFocus();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxViewViews, OmniboxView implementation:
 
-void OmniboxViewViews::SaveStateToTab(WebContents* tab) {
+void OmniboxViewViews::SaveStateToTab(content::WebContents* tab) {
   DCHECK(tab);
 
   // We don't want to keep the IME status, so force quit the current
   // session here.  It may affect the selection status, so order is
   // also important.
   if (IsIMEComposing()) {
     GetTextInputClient()->ConfirmCompositionText();
     GetInputMethod()->CancelComposition(this);
   }
 
   // NOTE: GetStateForTabSwitch may affect GetSelection, so order is important.
-  OmniboxEditModel::State model_state = model()->GetStateForTabSwitch();
+  OmniboxEditModel::State state = model()->GetStateForTabSwitch();
   gfx::SelectionModel selection;
   GetSelectionModel(&selection);
-  tab->SetUserData(
-      kAutocompleteEditStateKey,
-      new AutocompleteEditState(model_state, ViewState(selection)));
+  tab->SetUserData(OmniboxState::kKey, new OmniboxState(state, selection));
 }
 
-void OmniboxViewViews::Update(const WebContents* contents) {
+void OmniboxViewViews::Update(const content::WebContents* contents) {
   // NOTE: We're getting the URL text here from the ToolbarModel.
   bool visibly_changed_permanent_text =
       model()->UpdatePermanentText(toolbar_model()->GetText(true));
   ToolbarModel::SecurityLevel security_level =
         toolbar_model()->GetSecurityLevel();
   bool changed_security_level = (security_level != security_level_);
   security_level_ = security_level;
 
-  // TODO(oshima): Copied from gtk implementation which is
-  // slightly different from WIN impl. Find out the correct implementation
-  // for views-implementation.
+  // TODO(msw|oshima): Copied from GTK, determine correct Win/CrOS behavior.
   if (contents) {
     RevertAll();
-    const AutocompleteEditState* state = static_cast<AutocompleteEditState*>(
-        contents->GetUserData(&kAutocompleteEditStateKey));
+    const OmniboxState* state = static_cast<OmniboxState*>(
+        contents->GetUserData(&OmniboxState::kKey));
     if (state) {
+      // Restore the saved state and selection.
       model()->RestoreState(state->model_state);
-
-      // Move the marks for the cursor and the other end of the selection to
-      // the previously-saved offsets (but preserve PRIMARY).
-      SelectSelectionModel(state->view_state.selection_model);
-      // We do not carry over the current edit history to another tab.
-      // TODO(oshima): consider saving/restoring edit history.
+      SelectSelectionModel(state->selection_model);
+      // TODO(oshima): Consider saving/restoring edit history.
       ClearEditHistory();
     }
   } else if (visibly_changed_permanent_text) {
     RevertAll();
   } else if (changed_security_level) {
     EmphasizeURLComponents();
   }
 }
 
 string16 OmniboxViewViews::GetText() const {
@@ skipping 445 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);
   }
 }