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

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

Issue 8473006: Revert 110824 - Variety of crashes on XP dbg bots (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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) 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE; 195 virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
196 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; 196 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
197 virtual void OnMouseCaptureLost() OVERRIDE; 197 virtual void OnMouseCaptureLost() OVERRIDE;
198 #endif 198 #endif
199 199
200 LocationIconView* location_icon_view() { return location_icon_view_; } 200 LocationIconView* location_icon_view() { return location_icon_view_; }
201 const LocationIconView* location_icon_view() const { 201 const LocationIconView* location_icon_view() const {
202 return location_icon_view_; 202 return location_icon_view_;
203 } 203 }
204 204
205 views::View* location_entry_view() const { return location_entry_view_; }
206
207 // AutocompleteEditController 205 // AutocompleteEditController
208 virtual void OnAutocompleteAccept(const GURL& url, 206 virtual void OnAutocompleteAccept(const GURL& url,
209 WindowOpenDisposition disposition, 207 WindowOpenDisposition disposition,
210 content::PageTransition transition, 208 content::PageTransition transition,
211 const GURL& alternate_nav_url) OVERRIDE; 209 const GURL& alternate_nav_url) OVERRIDE;
212 virtual void OnChanged() OVERRIDE; 210 virtual void OnChanged() OVERRIDE;
213 virtual void OnSelectionBoundsChanged() OVERRIDE; 211 virtual void OnSelectionBoundsChanged() OVERRIDE;
214 virtual void OnInputInProgress(bool in_progress) OVERRIDE; 212 virtual void OnInputInProgress(bool in_progress) OVERRIDE;
215 virtual void OnKillFocus() OVERRIDE; 213 virtual void OnKillFocus() OVERRIDE;
216 virtual void OnSetFocus() OVERRIDE; 214 virtual void OnSetFocus() OVERRIDE;
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 // While animating, the host clips the widget and draws only the bottom 423 // While animating, the host clips the widget and draws only the bottom
426 // part of it. The view needs to know the pixel offset at which we are drawing 424 // part of it. The view needs to know the pixel offset at which we are drawing
427 // the widget so that we can draw the curved edges that attach to the toolbar 425 // the widget so that we can draw the curved edges that attach to the toolbar
428 // in the right location. 426 // in the right location.
429 int animation_offset_; 427 int animation_offset_;
430 428
431 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 429 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
432 }; 430 };
433 431
434 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 432 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/extensions/extension_installed_bubble.cc ('k') | ui/views/bubble/bubble_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698