Fix multiple problems with omnibox text handling across focus changes.
(1) RenderText was drawing unfocused selections with the non-selection
background color, but the selected text color, leading to white-on-white
text. Fix by drawing unfocused selected text as unselected.
(2) OmniboxViewViews was preserving selections across focus changes using
SaveStateToTab(), leading to problems when something about the omnibox state
changed after the omnibox was unfocused -- a later state restoration would
restore a selection model that no longer lined up with the rest of the
omnibox state (e.g. the current text). Fix by tracking selection across
focus changes in the same way OmniboxViewWin does.
(3) On tab changes, OnTabChanged() could be followed by an OnBlur()/OnFocus()
call if changing from a tab where the omnibox was focused to one where it
wasn't (or vice versa). This led to the selection state being stomped.
Fixed by making Browser give BrowserWindow first crack at handling the tab
change. This makes tabbing out of the omnibox, changing tabs away and back,
and tabbing back in correctly restore the selection even when changing
between tabs that disagree about whether the omnibox is focused.
BUG=293258
TEST=Following steps in bug comment 0 does not result in invisible text
[email protected], [email protected], [email protected]
Review URL: https://codereview.chromium.org/23536075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225074 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 850ba73..45804952 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1053,6 +1053,22 @@
int reason) {
content::RecordAction(UserMetricsAction("ActiveTabChanged"));
+ // Switch the find bar to the new tab if necessary. This must be done before
+ // changing focus for unittests to pass.
+ // TODO(pkasting): http://crbug.com/297385 Move this to near the end of this
+ // function (where it used to be) once the find bar properly restores
+ // selections across tab changes.
+ if (HasFindBarController()) {
+ find_bar_controller_->ChangeWebContents(new_contents);
+ find_bar_controller_->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true);
+ }
+
+ // Let the BrowserWindow do its handling. On e.g. views this changes the
+ // focused object, which should happen before we update the toolbar below,
+ // since the omnibox expects the correct element to already be focused when it
+ // is updated.
+ window_->OnActiveTabChanged(old_contents, new_contents, index, reason);
+
// Discarded tabs always get reloaded.
if (tab_strip_model_->IsTabDiscarded(index)) {
LOG(WARNING) << "Reloading discarded tab at " << index;
@@ -1088,11 +1104,6 @@
tab_strip_model_->GetActiveWebContents())->GetStatusText());
}
- if (HasFindBarController()) {
- find_bar_controller_->ChangeWebContents(new_contents);
- find_bar_controller_->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true);
- }
-
// Update sessions. Don't force creation of sessions. If sessions doesn't
// exist, the change will be picked up by sessions when created.
SessionService* session_service =
diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h
index 07bc569..f219b74 100644
--- a/chrome/browser/ui/browser_window.h
+++ b/chrome/browser/ui/browser_window.h
@@ -111,6 +111,14 @@
// Sets the starred state for the current tab.
virtual void SetStarredState(bool is_starred) = 0;
+ // Called when the active tab changes. Subclasses which implement
+ // TabStripModelObserver should implement this instead of ActiveTabChanged();
+ // the Browser will call this method while processing that one.
+ virtual void OnActiveTabChanged(content::WebContents* old_contents,
+ content::WebContents* new_contents,
+ int index,
+ int reason) = 0;
+
// Called to force the zoom state to for the active tab to be recalculated.
// |can_show_bubble| is true when a user presses the zoom up or down keyboard
// shortcuts and will be false in other cases (e.g. switching tabs, "clicking"
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
index 44d1447..efd9e94 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -58,6 +58,10 @@
virtual void UpdateDevTools() OVERRIDE;
virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;
virtual void SetStarredState(bool is_starred) OVERRIDE;
+ virtual void OnActiveTabChanged(content::WebContents* old_contents,
+ content::WebContents* new_contents,
+ int index,
+ int reason) OVERRIDE;
virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE;
virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index be60f5f..a26e674 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -305,6 +305,17 @@
[controller_ setStarredState:is_starred ? YES : NO];
}
+void BrowserWindowCocoa::OnActiveTabChanged(content::WebContents* old_contents,
+ content::WebContents* new_contents,
+ int index,
+ int reason) {
+ // TODO(pkasting): Perhaps the code in
+ // TabStripController::activateTabWithContents should move here? Or this
+ // should call that (instead of TabStripModelObserverBridge doing so)? It's
+ // not obvious to me why Mac doesn't handle tab changes in BrowserWindow the
+ // way views and GTK do.
+}
+
void BrowserWindowCocoa::ZoomChangedForActiveTab(bool can_show_bubble) {
[controller_ zoomChangedForActiveTab:can_show_bubble ? YES : NO];
}
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index ebc5d2b6..60460ef7 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -790,6 +790,35 @@
toolbar_->GetLocationBarView()->SetStarred(is_starred);
}
+void BrowserWindowGtk::OnActiveTabChanged(WebContents* old_contents,
+ WebContents* new_contents,
+ int index,
+ int reason) {
+ TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::ActiveTabChanged");
+ if (old_contents && !old_contents->IsBeingDestroyed())
+ old_contents->GetView()->StoreFocus();
+
+ // Update various elements that are interested in knowing the current
+ // WebContents.
+ UpdateDevToolsForContents(new_contents);
+ infobar_container_->ChangeInfoBarService(
+ InfoBarService::FromWebContents(new_contents));
+ contents_container_->SetTab(new_contents);
+
+ // TODO(estade): after we manage browser activation, add a check to make sure
+ // we are the active browser before calling RestoreFocus().
+ if (!browser_->tab_strip_model()->closing_all()) {
+ new_contents->GetView()->RestoreFocus();
+ FindTabHelper* find_tab_helper =
+ FindTabHelper::FromWebContents(new_contents);
+ if (find_tab_helper->find_ui_active())
+ browser_->GetFindBarController()->find_bar()->SetFocusAndSelection();
+ }
+
+ // Update all the UI bits.
+ UpdateTitleBar();
+ MaybeShowBookmarkBar(false);
+}
void BrowserWindowGtk::ZoomChangedForActiveTab(bool can_show_bubble) {
toolbar_->GetLocationBarView()->ZoomChangedForActiveTab(
can_show_bubble && !toolbar_->IsWrenchMenuShowing());
@@ -1216,36 +1245,6 @@
contents_container_->DetachTab(contents);
}
-void BrowserWindowGtk::ActiveTabChanged(WebContents* old_contents,
- WebContents* new_contents,
- int index,
- int reason) {
- TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::ActiveTabChanged");
- if (old_contents && !old_contents->IsBeingDestroyed())
- old_contents->GetView()->StoreFocus();
-
- // Update various elements that are interested in knowing the current
- // WebContents.
- UpdateDevToolsForContents(new_contents);
- infobar_container_->ChangeInfoBarService(
- InfoBarService::FromWebContents(new_contents));
- contents_container_->SetTab(new_contents);
-
- // TODO(estade): after we manage browser activation, add a check to make sure
- // we are the active browser before calling RestoreFocus().
- if (!browser_->tab_strip_model()->closing_all()) {
- new_contents->GetView()->RestoreFocus();
- FindTabHelper* find_tab_helper =
- FindTabHelper::FromWebContents(new_contents);
- if (find_tab_helper->find_ui_active())
- browser_->GetFindBarController()->find_bar()->SetFocusAndSelection();
- }
-
- // Update all the UI bits.
- UpdateTitleBar();
- MaybeShowBookmarkBar(false);
-}
-
void BrowserWindowGtk::ActiveWindowChanged(GdkWindow* active_window) {
// Do nothing if we're in the process of closing the browser window.
if (!window_)
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
index 1e6aa039..fc7e690 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -93,6 +93,10 @@
virtual void UpdateDevTools() OVERRIDE;
virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;
virtual void SetStarredState(bool is_starred) OVERRIDE;
+ virtual void OnActiveTabChanged(content::WebContents* old_contents,
+ content::WebContents* new_contents,
+ int index,
+ int reason) OVERRIDE;
virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE;
virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
@@ -186,10 +190,6 @@
// Overridden from TabStripModelObserver:
virtual void TabDetachedAt(content::WebContents* contents,
int index) OVERRIDE;
- virtual void ActiveTabChanged(content::WebContents* old_contents,
- content::WebContents* new_contents,
- int index,
- int reason) OVERRIDE;
// Overridden from ActiveWindowWatcherXObserver.
virtual void ActiveWindowChanged(GdkWindow* active_window) OVERRIDE;
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index e216446..992958b0 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -775,6 +775,54 @@
GetLocationBarView()->SetStarToggled(is_starred);
}
+void BrowserView::OnActiveTabChanged(content::WebContents* old_contents,
+ content::WebContents* new_contents,
+ int index,
+ int reason) {
+ DCHECK(new_contents);
+
+ // If |contents_container_| already has the correct WebContents, we can save
+ // some work. This also prevents extra events from being reported by the
+ // Visibility API under Windows, as ChangeWebContents will briefly hide
+ // the WebContents window.
+ bool change_tab_contents =
+ contents_web_view_->web_contents() != new_contents;
+
+ // Update various elements that are interested in knowing the current
+ // WebContents.
+
+ // When we toggle the NTP floating bookmarks bar and/or the info bar,
+ // we don't want any WebContents to be attached, so that we
+ // avoid an unnecessary resize and re-layout of a WebContents.
+ if (change_tab_contents)
+ contents_web_view_->SetWebContents(NULL);
+ infobar_container_->ChangeInfoBarService(
+ InfoBarService::FromWebContents(new_contents));
+ if (bookmark_bar_view_.get()) {
+ bookmark_bar_view_->SetBookmarkBarState(
+ browser_->bookmark_bar_state(),
+ BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
+ }
+ UpdateUIForContents(new_contents);
+
+ // Layout for DevTools _before_ setting the main WebContents to avoid
+ // toggling the size of the main WebContents.
+ UpdateDevToolsForContents(new_contents);
+
+ if (change_tab_contents)
+ contents_web_view_->SetWebContents(new_contents);
+
+ if (!browser_->tab_strip_model()->closing_all() && GetWidget()->IsActive() &&
+ GetWidget()->IsVisible()) {
+ // We only restore focus if our window is visible, to avoid invoking blur
+ // handlers when we are eventually shown.
+ new_contents->GetView()->RestoreFocus();
+ }
+
+ // Update all the UI bits.
+ UpdateTitleBar();
+}
+
void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) {
GetLocationBarView()->ZoomChangedForActiveTab(
can_show_bubble && !toolbar_->IsWrenchMenuShowing());
@@ -1397,57 +1445,6 @@
contents->GetView()->StoreFocus();
}
-void BrowserView::ActiveTabChanged(content::WebContents* old_contents,
- content::WebContents* new_contents,
- int index,
- int reason) {
- DCHECK(new_contents);
-
- // If |contents_container_| already has the correct WebContents, we can save
- // some work. This also prevents extra events from being reported by the
- // Visibility API under Windows, as ChangeWebContents will briefly hide
- // the WebContents window.
- bool change_tab_contents =
- contents_web_view_->web_contents() != new_contents;
-
- // Update various elements that are interested in knowing the current
- // WebContents.
-
- // When we toggle the NTP floating bookmarks bar and/or the info bar,
- // we don't want any WebContents to be attached, so that we
- // avoid an unnecessary resize and re-layout of a WebContents.
- if (change_tab_contents)
- contents_web_view_->SetWebContents(NULL);
- infobar_container_->ChangeInfoBarService(
- InfoBarService::FromWebContents(new_contents));
- if (bookmark_bar_view_.get()) {
- bookmark_bar_view_->SetBookmarkBarState(
- browser_->bookmark_bar_state(),
- BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
- }
- UpdateUIForContents(new_contents);
-
- // Layout for DevTools _before_ setting the main WebContents to avoid
- // toggling the size of the main WebContents.
- UpdateDevToolsForContents(new_contents);
-
- if (change_tab_contents)
- contents_web_view_->SetWebContents(new_contents);
-
- if (!browser_->tab_strip_model()->closing_all() && GetWidget()->IsActive() &&
- GetWidget()->IsVisible()) {
- // We only restore focus if our window is visible, to avoid invoking blur
- // handlers when we are eventually shown.
- new_contents->GetView()->RestoreFocus();
- }
-
- // Update all the UI bits.
- UpdateTitleBar();
-
- // No need to update Toolbar because it's already updated in
- // browser.cc.
-}
-
void BrowserView::TabStripEmpty() {
// Make sure all optional UI is removed before we are destroyed, otherwise
// there will be consequences (since our view hierarchy will still have
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 9bb5219..a7a3421 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -272,6 +272,10 @@
virtual void UpdateDevTools() OVERRIDE;
virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;
virtual void SetStarredState(bool is_starred) OVERRIDE;
+ virtual void OnActiveTabChanged(content::WebContents* old_contents,
+ content::WebContents* new_contents,
+ int index,
+ int reason) OVERRIDE;
virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE;
virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
@@ -376,10 +380,6 @@
virtual void TabDetachedAt(content::WebContents* contents,
int index) OVERRIDE;
virtual void TabDeactivated(content::WebContents* contents) OVERRIDE;
- virtual void ActiveTabChanged(content::WebContents* old_contents,
- content::WebContents* new_contents,
- int index,
- int reason) OVERRIDE;
virtual void TabStripEmpty() OVERRIDE;
// Overridden from ui::AcceleratorProvider:
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index bf56ecc..faa17d8 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -68,20 +68,29 @@
static const char kKey[];
OmniboxState(const OmniboxEditModel::State& model_state,
- const gfx::SelectionModel& selection_model);
+ const gfx::Range& selection,
+ const gfx::Range& saved_selection_for_focus_change);
virtual ~OmniboxState();
const OmniboxEditModel::State model_state;
- const gfx::SelectionModel selection_model;
+
+ // We store both the actual selection and any saved selection (for when the
+ // omnibox is not focused). This allows us to properly handle cases like
+ // selecting text, tabbing out of the omnibox, switching tabs away and back,
+ // and tabbing back into the omnibox.
+ const gfx::Range selection;
+ const gfx::Range saved_selection_for_focus_change;
};
// static
const char OmniboxState::kKey[] = "OmniboxState";
OmniboxState::OmniboxState(const OmniboxEditModel::State& model_state,
- const gfx::SelectionModel& selection_model)
+ const gfx::Range& selection,
+ const gfx::Range& saved_selection_for_focus_change)
: model_state(model_state),
- selection_model(selection_model) {
+ selection(selection),
+ saved_selection_for_focus_change(saved_selection_for_focus_change) {
}
OmniboxState::~OmniboxState() {}
@@ -129,6 +138,7 @@
: OmniboxView(profile, controller, command_updater),
popup_window_mode_(popup_window_mode),
security_level_(ToolbarModel::NONE),
+ saved_selection_for_focus_change_(gfx::Range::InvalidRange()),
ime_composing_before_change_(false),
delete_at_end_pressed_(false),
location_bar_view_(location_bar),
@@ -186,6 +196,10 @@
views::Textfield::OnGestureEvent(event);
if (!HasFocus() && event->type() == ui::ET_GESTURE_TAP_DOWN) {
select_all_on_gesture_tap_ = true;
+
+ // If we're trying to select all on tap, invalidate any saved selection lest
+ // restoring it fights with the "select all" action.
+ saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
return;
}
if (select_all_on_gesture_tap_ && event->type() == ui::ET_GESTURE_TAP)
@@ -202,12 +216,20 @@
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_)
+ if (select_all_on_mouse_release_) {
+ // 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().
model()->SetCaretVisibility(true);
+
+ // When we're going to select all on mouse release, invalidate any saved
+ // selection lest restoring it fights with the "select all" action. It's
+ // possible to later set select_all_on_mouse_release_ back to false, but
+ // that happens for things like dragging, which are cases where having
+ // invalidated this saved selection is still OK.
+ saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
+ }
return views::Textfield::OnMousePressed(event);
}
@@ -329,19 +351,16 @@
model()->OnSetFocus(false);
// Don't call controller()->OnSetFocus, this view has already acquired focus.
- // Restore a valid saved selection on tab-to-focus.
- if (location_bar_view_->GetWebContents() && !select_all_on_mouse_release_) {
- const OmniboxState* state = static_cast<OmniboxState*>(
- location_bar_view_->GetWebContents()->GetUserData(&OmniboxState::kKey));
- if (state)
- SelectSelectionModel(state->selection_model);
+ // Restore the selection we saved in OnBlur() if it's still valid.
+ if (saved_selection_for_focus_change_.IsValid()) {
+ SelectRange(saved_selection_for_focus_change_);
+ saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
}
}
void OmniboxViewViews::OnBlur() {
- // Save the selection to restore on tab-to-focus.
- if (location_bar_view_->GetWebContents())
- SaveStateToTab(location_bar_view_->GetWebContents());
+ // Save the user's existing selection to restore it later.
+ saved_selection_for_focus_change_ = GetSelectedRange();
views::Textfield::OnBlur();
gfx::NativeView native_view = NULL;
@@ -357,6 +376,7 @@
model()->OnWillKillFocus(native_view);
// Close the popup.
CloseOmniboxPopup();
+
// Tell the model to reset itself.
model()->OnKillFocus();
controller()->OnKillFocus();
@@ -379,10 +399,11 @@
GetInputMethod()->CancelComposition(this);
}
- // NOTE: GetStateForTabSwitch may affect GetSelection, so order is important.
+ // NOTE: GetStateForTabSwitch() may affect GetSelectedRange(), so order is
+ // important.
OmniboxEditModel::State state = model()->GetStateForTabSwitch();
- const gfx::SelectionModel selection = GetSelectionModel();
- tab->SetUserData(OmniboxState::kKey, new OmniboxState(state, selection));
+ tab->SetUserData(OmniboxState::kKey, new OmniboxState(
+ state, GetSelectedRange(), saved_selection_for_focus_change_));
}
void OmniboxViewViews::OnTabChanged(const content::WebContents* web_contents) {
@@ -391,8 +412,14 @@
const OmniboxState* state = static_cast<OmniboxState*>(
web_contents->GetUserData(&OmniboxState::kKey));
model()->RestoreState(state ? &state->model_state : NULL);
- if (state)
- SelectSelectionModel(state->selection_model);
+ if (state) {
+ // This assumes that the omnibox has already been focused or blurred as
+ // appropriate; otherwise, a subsequent OnFocus() or OnBlur() call could
+ // goof up the selection. See comments at the end of
+ // BrowserView::ActiveTabChanged().
+ SelectRange(state->selection);
+ saved_selection_for_focus_change_ = state->saved_selection_for_focus_change;
+ }
// TODO(msw|oshima): Consider saving/restoring edit history.
ClearEditHistory();
@@ -436,6 +463,13 @@
return text();
}
+void OmniboxViewViews::SetUserText(const string16& text,
+ const string16& display_text,
+ bool update_popup) {
+ saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
+ OmniboxView::SetUserText(text, display_text, update_popup);
+}
+
void OmniboxViewViews::SetWindowTextAndCaretPos(const string16& text,
size_t caret_pos,
bool update_popup,
@@ -454,7 +488,7 @@
const string16 current_text(text());
const size_t start = current_text.find_first_not_of(kWhitespaceUTF16);
if (start == string16::npos || (current_text[start] != '?'))
- SetUserText(ASCIIToUTF16("?"));
+ OmniboxView::SetUserText(ASCIIToUTF16("?"));
else
SelectRange(gfx::Range(current_text.size(), start + 1));
}
@@ -479,6 +513,11 @@
views::Textfield::SelectAll(reversed);
}
+void OmniboxViewViews::RevertAll() {
+ saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
+ OmniboxView::RevertAll();
+}
+
void OmniboxViewViews::UpdatePopup() {
model()->SetInputInProgress(true);
if (!model()->has_focus())
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
index dda2c84..af991f0 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -75,6 +75,9 @@
virtual void OnTabChanged(const content::WebContents* web_contents) OVERRIDE;
virtual void Update() OVERRIDE;
virtual string16 GetText() const OVERRIDE;
+ virtual void SetUserText(const string16& text,
+ const string16& display_text,
+ bool update_popup) OVERRIDE;
virtual void SetWindowTextAndCaretPos(const string16& text,
size_t caret_pos,
bool update_popup,
@@ -85,6 +88,7 @@
virtual void GetSelectionBounds(string16::size_type* start,
string16::size_type* end) const OVERRIDE;
virtual void SelectAll(bool reversed) OVERRIDE;
+ virtual void RevertAll() OVERRIDE;
virtual void UpdatePopup() OVERRIDE;
virtual void SetFocus() OVERRIDE;
virtual void ApplyCaretVisibility() OVERRIDE;
@@ -170,6 +174,10 @@
// Selection persisted across temporary text changes, like popup suggestions.
gfx::Range saved_temporary_selection_;
+ // Holds the user's selection across focus changes. There is only a saved
+ // selection if this range IsValid().
+ gfx::Range saved_selection_for_focus_change_;
+
// Tracking state before and after a possible change.
string16 text_before_change_;
gfx::Range sel_before_change_;
