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

Side by Side Diff: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.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_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 virtual void GetSelectionBounds(string16::size_type* start, 44 virtual void GetSelectionBounds(string16::size_type* start,
45 string16::size_type* end) const OVERRIDE; 45 string16::size_type* end) const OVERRIDE;
46 virtual void SelectAll(bool reversed) OVERRIDE; 46 virtual void SelectAll(bool reversed) OVERRIDE;
47 virtual void RevertAll() OVERRIDE; 47 virtual void RevertAll() OVERRIDE;
48 virtual void UpdatePopup() OVERRIDE; 48 virtual void UpdatePopup() OVERRIDE;
49 virtual void CloseOmniboxPopup() OVERRIDE; 49 virtual void CloseOmniboxPopup() OVERRIDE;
50 virtual void SetFocus() OVERRIDE; 50 virtual void SetFocus() OVERRIDE;
51 virtual void ApplyCaretVisibility() OVERRIDE; 51 virtual void ApplyCaretVisibility() OVERRIDE;
52 virtual void OnTemporaryTextMaybeChanged( 52 virtual void OnTemporaryTextMaybeChanged(
53 const string16& display_text, 53 const string16& display_text,
54 bool save_original_selection) OVERRIDE; 54 bool save_original_selection,
55 bool notify_text_changed) OVERRIDE;
55 virtual bool OnInlineAutocompleteTextMaybeChanged( 56 virtual bool OnInlineAutocompleteTextMaybeChanged(
56 const string16& display_text, size_t user_text_length) OVERRIDE; 57 const string16& display_text, size_t user_text_length) OVERRIDE;
57 virtual void OnStartingIME() OVERRIDE; 58 virtual void OnStartingIME() OVERRIDE;
58 virtual void OnRevertTemporaryText() OVERRIDE; 59 virtual void OnRevertTemporaryText() OVERRIDE;
59 virtual void OnBeforePossibleChange() OVERRIDE; 60 virtual void OnBeforePossibleChange() OVERRIDE;
60 virtual bool OnAfterPossibleChange() OVERRIDE; 61 virtual bool OnAfterPossibleChange() OVERRIDE;
61 virtual gfx::NativeView GetNativeView() const OVERRIDE; 62 virtual gfx::NativeView GetNativeView() const OVERRIDE;
62 virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE; 63 virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE;
63 virtual void SetInstantSuggestion(const string16& input) OVERRIDE; 64 virtual void SetInstantSuggestion(const string16& input) OVERRIDE;
64 virtual string16 GetInstantSuggestion() const OVERRIDE; 65 virtual string16 GetInstantSuggestion() const OVERRIDE;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 // Was the delete key pressed with an empty selection at the end of the edit? 189 // Was the delete key pressed with an empty selection at the end of the edit?
189 bool delete_at_end_pressed_; 190 bool delete_at_end_pressed_;
190 191
191 // The maximum/standard line height for the displayed text. 192 // The maximum/standard line height for the displayed text.
192 CGFloat line_height_; 193 CGFloat line_height_;
193 194
194 DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac); 195 DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac);
195 }; 196 };
196 197
197 #endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_ 198 #endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698