Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(992)

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.h

Issue 11889003: Fixing ESC in instant-extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reworked to send ESC down to JS, added test. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 virtual bool IsSelectAll() const OVERRIDE; 107 virtual bool IsSelectAll() const OVERRIDE;
108 virtual bool DeleteAtEndPressed() OVERRIDE; 108 virtual bool DeleteAtEndPressed() OVERRIDE;
109 virtual void GetSelectionBounds(string16::size_type* start, 109 virtual void GetSelectionBounds(string16::size_type* start,
110 string16::size_type* end) const OVERRIDE; 110 string16::size_type* end) const OVERRIDE;
111 virtual void SelectAll(bool reversed) OVERRIDE; 111 virtual void SelectAll(bool reversed) OVERRIDE;
112 virtual void UpdatePopup() OVERRIDE; 112 virtual void UpdatePopup() OVERRIDE;
113 virtual void SetFocus() OVERRIDE; 113 virtual void SetFocus() OVERRIDE;
114 virtual void ApplyCaretVisibility() OVERRIDE; 114 virtual void ApplyCaretVisibility() OVERRIDE;
115 virtual void OnTemporaryTextMaybeChanged( 115 virtual void OnTemporaryTextMaybeChanged(
116 const string16& display_text, 116 const string16& display_text,
117 bool save_original_selection) OVERRIDE; 117 bool save_original_selection,
118 bool notify_text_changed) OVERRIDE;
118 virtual bool OnInlineAutocompleteTextMaybeChanged( 119 virtual bool OnInlineAutocompleteTextMaybeChanged(
119 const string16& display_text, size_t user_text_length) OVERRIDE; 120 const string16& display_text, size_t user_text_length) OVERRIDE;
120 virtual void OnRevertTemporaryText() OVERRIDE; 121 virtual void OnRevertTemporaryText() OVERRIDE;
121 virtual void OnBeforePossibleChange() OVERRIDE; 122 virtual void OnBeforePossibleChange() OVERRIDE;
122 virtual bool OnAfterPossibleChange() OVERRIDE; 123 virtual bool OnAfterPossibleChange() OVERRIDE;
123 virtual gfx::NativeView GetNativeView() const OVERRIDE; 124 virtual gfx::NativeView GetNativeView() const OVERRIDE;
124 virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE; 125 virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE;
125 virtual void SetInstantSuggestion(const string16& input) OVERRIDE; 126 virtual void SetInstantSuggestion(const string16& input) OVERRIDE;
126 virtual string16 GetInstantSuggestion() const OVERRIDE; 127 virtual string16 GetInstantSuggestion() const OVERRIDE;
127 virtual int TextWidth() const OVERRIDE; 128 virtual int TextWidth() const OVERRIDE;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 225
225 // Indicates if we want to select all text in the omnibox when we get a 226 // Indicates if we want to select all text in the omnibox when we get a
226 // GESTURE_TAP. We want to select all only when the textfield is not in focus 227 // GESTURE_TAP. We want to select all only when the textfield is not in focus
227 // and gets a tap. So we use this variable to remember focus state before tap. 228 // and gets a tap. So we use this variable to remember focus state before tap.
228 bool select_all_on_gesture_tap_; 229 bool select_all_on_gesture_tap_;
229 230
230 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews); 231 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
231 }; 232 };
232 233
233 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 234 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698