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

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

Issue 2273263002: MacViewsBrowser: Fix omnibox crash due to failed DCHECK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review, make Textfield::OnKeyPressed/Released final. Created 4 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 void SetGrayTextAutocompletion(const base::string16& input) override; 155 void SetGrayTextAutocompletion(const base::string16& input) override;
156 base::string16 GetGrayTextAutocompletion() const override; 156 base::string16 GetGrayTextAutocompletion() const override;
157 int GetWidth() const override; 157 int GetWidth() const override;
158 bool IsImeShowingPopup() const override; 158 bool IsImeShowingPopup() const override;
159 void ShowImeIfNeeded() override; 159 void ShowImeIfNeeded() override;
160 void OnMatchOpened(AutocompleteMatch::Type match_type) override; 160 void OnMatchOpened(AutocompleteMatch::Type match_type) override;
161 int GetOmniboxTextLength() const override; 161 int GetOmniboxTextLength() const override;
162 void EmphasizeURLComponents() override; 162 void EmphasizeURLComponents() override;
163 163
164 // views::Textfield: 164 // views::Textfield:
165 bool OnKeyReleased(const ui::KeyEvent& event) override;
166 bool IsItemForCommandIdDynamic(int command_id) const override; 165 bool IsItemForCommandIdDynamic(int command_id) const override;
167 base::string16 GetLabelForCommandId(int command_id) const override; 166 base::string16 GetLabelForCommandId(int command_id) const override;
168 const char* GetClassName() const override; 167 const char* GetClassName() const override;
169 bool OnMousePressed(const ui::MouseEvent& event) override; 168 bool OnMousePressed(const ui::MouseEvent& event) override;
170 bool OnMouseDragged(const ui::MouseEvent& event) override; 169 bool OnMouseDragged(const ui::MouseEvent& event) override;
171 void OnMouseReleased(const ui::MouseEvent& event) override; 170 void OnMouseReleased(const ui::MouseEvent& event) override;
172 bool OnKeyPressed(const ui::KeyEvent& event) override;
173 void OnGestureEvent(ui::GestureEvent* event) override; 171 void OnGestureEvent(ui::GestureEvent* event) override;
174 void AboutToRequestFocusFromTabTraversal(bool reverse) override; 172 void AboutToRequestFocusFromTabTraversal(bool reverse) override;
175 bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) override; 173 bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) override;
176 void GetAccessibleState(ui::AXViewState* state) override; 174 void GetAccessibleState(ui::AXViewState* state) override;
177 void OnFocus() override; 175 void OnFocus() override;
178 void OnBlur() override; 176 void OnBlur() override;
179 bool IsCommandIdEnabled(int command_id) const override; 177 bool IsCommandIdEnabled(int command_id) const override;
180 base::string16 GetSelectionClipboardText() const override; 178 base::string16 GetSelectionClipboardText() const override;
181 void DoInsertChar(base::char16 ch) override; 179 void DoInsertChar(base::char16 ch) override;
182 bool IsTextEditCommandEnabled(ui::TextEditCommand command) const override; 180 bool IsTextEditCommandEnabled(ui::TextEditCommand command) const override;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 // painted. Used to measure omnibox responsiveness with a histogram. 251 // painted. Used to measure omnibox responsiveness with a histogram.
254 base::TimeTicks insert_char_time_; 252 base::TimeTicks insert_char_time_;
255 253
256 // Used to bind callback functions to this object. 254 // Used to bind callback functions to this object.
257 base::WeakPtrFactory<OmniboxViewViews> weak_ptr_factory_; 255 base::WeakPtrFactory<OmniboxViewViews> weak_ptr_factory_;
258 256
259 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews); 257 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
260 }; 258 };
261 259
262 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 260 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698