chrome/renderer/searchbox/searchbox.h - Issue 11889003: Fixing ESC in instant-extended.

Side by Side Diff: chrome/renderer/searchbox/searchbox.h

Issue 11889003: Fixing ESC in instant-extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Answered Sreeram's comment, fixed Jeremy's problem and updated tests. 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

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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_RENDERER_SEARCHBOX_SEARCHBOX_H_	5 #ifndef CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_

6 #define CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_	6 #define CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 size_t selection_start,	79 size_t selection_start,

80 size_t selection_end);	80 size_t selection_end);

81 void OnSubmit(const string16& query);	81 void OnSubmit(const string16& query);

82 void OnCancel(const string16& query);	82 void OnCancel(const string16& query);

83 void OnPopupResize(const gfx::Rect& bounds);	83 void OnPopupResize(const gfx::Rect& bounds);

84 void OnMarginChange(int start, int end);	84 void OnMarginChange(int start, int end);

85 void OnDetermineIfPageSupportsInstant();	85 void OnDetermineIfPageSupportsInstant();

86 void OnAutocompleteResults(	86 void OnAutocompleteResults(

87 const std::vector<InstantAutocompleteResult>& results);	87 const std::vector<InstantAutocompleteResult>& results);

88 void OnUpOrDownKeyPressed(int count);	88 void OnUpOrDownKeyPressed(int count);

	89 void OnCancelSelection(string16 query);
	sreeram 2013/02/12 20:52:59 const string16& const string16& beaudoin 2013/02/12 21:34:41 Dammit! Forgot one. Done. Show quoted text On 2013/02/12 20:52:59, sreeram wrote: > const string16& Dammit! Forgot one. Done.
89 void OnKeyCaptureChange(bool is_key_capture_enabled);	90 void OnKeyCaptureChange(bool is_key_capture_enabled);

90 void OnModeChanged(const chrome::search::Mode& mode);	91 void OnModeChanged(const chrome::search::Mode& mode);

91 void OnSetDisplayInstantResults(bool display_instant_results);	92 void OnSetDisplayInstantResults(bool display_instant_results);

92 void OnThemeChanged(const ThemeBackgroundInfo& theme_info);	93 void OnThemeChanged(const ThemeBackgroundInfo& theme_info);

93 void OnThemeAreaHeightChanged(int height);	94 void OnThemeAreaHeightChanged(int height);

94 void OnFontInformationReceived(const string16& omnibox_font,	95 void OnFontInformationReceived(const string16& omnibox_font,

95 size_t omnibox_font_size);	96 size_t omnibox_font_size);

96	97

97 // Returns the current zoom factor of the render view or 1 on failure.	98 // Returns the current zoom factor of the render view or 1 on failure.

98 double GetZoom() const;	99 double GetZoom() const;

(...skipping 17 matching lines...) Expand all Loading...
116 ThemeBackgroundInfo theme_info_;	117 ThemeBackgroundInfo theme_info_;

117 int theme_area_height_;	118 int theme_area_height_;

118 bool display_instant_results_;	119 bool display_instant_results_;

119 string16 omnibox_font_;	120 string16 omnibox_font_;

120 size_t omnibox_font_size_;	121 size_t omnibox_font_size_;

121	122

122 DISALLOW_COPY_AND_ASSIGN(SearchBox);	123 DISALLOW_COPY_AND_ASSIGN(SearchBox);

123 };	124 };

124	125

125 #endif // CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_	126 #endif // CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_

OLD	NEW