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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 6306011: Remove wstring from autocomplete. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 // Event Handlers 188 // Event Handlers
189 virtual bool OnMousePressed(const views::MouseEvent& event); 189 virtual bool OnMousePressed(const views::MouseEvent& event);
190 virtual bool OnMouseDragged(const views::MouseEvent& event); 190 virtual bool OnMouseDragged(const views::MouseEvent& event);
191 virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled); 191 virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
192 #endif 192 #endif
193 193
194 // AutocompleteEditController 194 // AutocompleteEditController
195 virtual void OnAutocompleteWillClosePopup(); 195 virtual void OnAutocompleteWillClosePopup();
196 virtual void OnAutocompleteLosingFocus(gfx::NativeView view_gaining_focus); 196 virtual void OnAutocompleteLosingFocus(gfx::NativeView view_gaining_focus);
197 virtual void OnAutocompleteWillAccept(); 197 virtual void OnAutocompleteWillAccept();
198 virtual bool OnCommitSuggestedText(const std::wstring& typed_text); 198 virtual bool OnCommitSuggestedText(const string16& typed_text);
199 virtual bool AcceptCurrentInstantPreview(); 199 virtual bool AcceptCurrentInstantPreview();
200 virtual void OnPopupBoundsChanged(const gfx::Rect& bounds); 200 virtual void OnPopupBoundsChanged(const gfx::Rect& bounds);
201 virtual void OnAutocompleteAccept(const GURL& url, 201 virtual void OnAutocompleteAccept(const GURL& url,
202 WindowOpenDisposition disposition, 202 WindowOpenDisposition disposition,
203 PageTransition::Type transition, 203 PageTransition::Type transition,
204 const GURL& alternate_nav_url); 204 const GURL& alternate_nav_url);
205 virtual void OnChanged(); 205 virtual void OnChanged();
206 virtual void OnSelectionBoundsChanged(); 206 virtual void OnSelectionBoundsChanged();
207 virtual void OnInputInProgress(bool in_progress); 207 virtual void OnInputInProgress(bool in_progress);
208 virtual void OnKillFocus(); 208 virtual void OnKillFocus();
209 virtual void OnSetFocus(); 209 virtual void OnSetFocus();
210 virtual SkBitmap GetFavIcon() const; 210 virtual SkBitmap GetFavIcon() const;
211 virtual std::wstring GetTitle() const; 211 virtual string16 GetTitle() const;
212 212
213 // Overridden from views::View: 213 // Overridden from views::View:
214 virtual std::string GetClassName() const; 214 virtual std::string GetClassName() const;
215 virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e); 215 virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e);
216 virtual AccessibilityTypes::Role GetAccessibleRole(); 216 virtual AccessibilityTypes::Role GetAccessibleRole();
217 217
218 // Overridden from views::DragController: 218 // Overridden from views::DragController:
219 virtual void WriteDragData(View* sender, 219 virtual void WriteDragData(View* sender,
220 const gfx::Point& press_pt, 220 const gfx::Point& press_pt,
221 OSExchangeData* data); 221 OSExchangeData* data);
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 // Should instant be updated? This is set to false in OnAutocompleteWillAccept 410 // Should instant be updated? This is set to false in OnAutocompleteWillAccept
411 // and true in OnAutocompleteAccept. This is needed as prior to accepting an 411 // and true in OnAutocompleteAccept. This is needed as prior to accepting an
412 // autocomplete suggestion the model is reverted which triggers resetting 412 // autocomplete suggestion the model is reverted which triggers resetting
413 // instant. 413 // instant.
414 bool update_instant_; 414 bool update_instant_;
415 415
416 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 416 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
417 }; 417 };
418 418
419 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 419 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698