| OLD | NEW |
| 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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 virtual void OnMouseCaptureLost() OVERRIDE; | 200 virtual void OnMouseCaptureLost() OVERRIDE; |
| 201 #endif | 201 #endif |
| 202 | 202 |
| 203 const LocationIconView* location_icon_view() const { | 203 const LocationIconView* location_icon_view() const { |
| 204 return location_icon_view_; | 204 return location_icon_view_; |
| 205 } | 205 } |
| 206 | 206 |
| 207 // AutocompleteEditController | 207 // AutocompleteEditController |
| 208 virtual void OnAutocompleteAccept(const GURL& url, | 208 virtual void OnAutocompleteAccept(const GURL& url, |
| 209 WindowOpenDisposition disposition, | 209 WindowOpenDisposition disposition, |
| 210 PageTransition::Type transition, | 210 content::PageTransition transition, |
| 211 const GURL& alternate_nav_url) OVERRIDE; | 211 const GURL& alternate_nav_url) OVERRIDE; |
| 212 virtual void OnChanged() OVERRIDE; | 212 virtual void OnChanged() OVERRIDE; |
| 213 virtual void OnSelectionBoundsChanged() OVERRIDE; | 213 virtual void OnSelectionBoundsChanged() OVERRIDE; |
| 214 virtual void OnInputInProgress(bool in_progress) OVERRIDE; | 214 virtual void OnInputInProgress(bool in_progress) OVERRIDE; |
| 215 virtual void OnKillFocus() OVERRIDE; | 215 virtual void OnKillFocus() OVERRIDE; |
| 216 virtual void OnSetFocus() OVERRIDE; | 216 virtual void OnSetFocus() OVERRIDE; |
| 217 virtual SkBitmap GetFavicon() const OVERRIDE; | 217 virtual SkBitmap GetFavicon() const OVERRIDE; |
| 218 virtual string16 GetTitle() const OVERRIDE; | 218 virtual string16 GetTitle() const OVERRIDE; |
| 219 virtual InstantController* GetInstant() OVERRIDE; | 219 virtual InstantController* GetInstant() OVERRIDE; |
| 220 virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE; | 220 virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE; |
| (...skipping 13 matching lines...) Expand all Loading... |
| 234 virtual bool CanStartDragForView(View* sender, | 234 virtual bool CanStartDragForView(View* sender, |
| 235 const gfx::Point& press_pt, | 235 const gfx::Point& press_pt, |
| 236 const gfx::Point& p) OVERRIDE; | 236 const gfx::Point& p) OVERRIDE; |
| 237 | 237 |
| 238 // Overridden from LocationBar: | 238 // Overridden from LocationBar: |
| 239 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE; | 239 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE; |
| 240 virtual void SetSuggestedText(const string16& text, | 240 virtual void SetSuggestedText(const string16& text, |
| 241 InstantCompleteBehavior behavior) OVERRIDE; | 241 InstantCompleteBehavior behavior) OVERRIDE; |
| 242 virtual string16 GetInputString() const OVERRIDE; | 242 virtual string16 GetInputString() const OVERRIDE; |
| 243 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; | 243 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; |
| 244 virtual PageTransition::Type GetPageTransition() const OVERRIDE; | 244 virtual content::PageTransition GetPageTransition() const OVERRIDE; |
| 245 virtual void AcceptInput() OVERRIDE; | 245 virtual void AcceptInput() OVERRIDE; |
| 246 virtual void FocusLocation(bool select_all) OVERRIDE; | 246 virtual void FocusLocation(bool select_all) OVERRIDE; |
| 247 virtual void FocusSearch() OVERRIDE; | 247 virtual void FocusSearch() OVERRIDE; |
| 248 virtual void UpdateContentSettingsIcons() OVERRIDE; | 248 virtual void UpdateContentSettingsIcons() OVERRIDE; |
| 249 virtual void UpdatePageActions() OVERRIDE; | 249 virtual void UpdatePageActions() OVERRIDE; |
| 250 virtual void InvalidatePageActions() OVERRIDE; | 250 virtual void InvalidatePageActions() OVERRIDE; |
| 251 virtual void SaveStateToContents(TabContents* contents) OVERRIDE; | 251 virtual void SaveStateToContents(TabContents* contents) OVERRIDE; |
| 252 virtual void Revert() OVERRIDE; | 252 virtual void Revert() OVERRIDE; |
| 253 virtual const OmniboxView* location_entry() const OVERRIDE; | 253 virtual const OmniboxView* location_entry() const OVERRIDE; |
| 254 virtual OmniboxView* location_entry() OVERRIDE; | 254 virtual OmniboxView* location_entry() OVERRIDE; |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 Delegate* delegate_; | 354 Delegate* delegate_; |
| 355 | 355 |
| 356 // This is the string of text from the autocompletion session that the user | 356 // This is the string of text from the autocompletion session that the user |
| 357 // entered or selected. | 357 // entered or selected. |
| 358 string16 location_input_; | 358 string16 location_input_; |
| 359 | 359 |
| 360 // The user's desired disposition for how their input should be opened | 360 // The user's desired disposition for how their input should be opened |
| 361 WindowOpenDisposition disposition_; | 361 WindowOpenDisposition disposition_; |
| 362 | 362 |
| 363 // The transition type to use for the navigation | 363 // The transition type to use for the navigation |
| 364 PageTransition::Type transition_; | 364 content::PageTransition transition_; |
| 365 | 365 |
| 366 // Font used by edit and some of the hints. | 366 // Font used by edit and some of the hints. |
| 367 gfx::Font font_; | 367 gfx::Font font_; |
| 368 | 368 |
| 369 // An object used to paint the normal-mode background. | 369 // An object used to paint the normal-mode background. |
| 370 scoped_ptr<views::Painter> painter_; | 370 scoped_ptr<views::Painter> painter_; |
| 371 | 371 |
| 372 // An icon to the left of the edit field. | 372 // An icon to the left of the edit field. |
| 373 LocationIconView* location_icon_view_; | 373 LocationIconView* location_icon_view_; |
| 374 | 374 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 // While animating, the host clips the widget and draws only the bottom | 425 // 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 | 426 // 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 | 427 // the widget so that we can draw the curved edges that attach to the toolbar |
| 428 // in the right location. | 428 // in the right location. |
| 429 int animation_offset_; | 429 int animation_offset_; |
| 430 | 430 |
| 431 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); | 431 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); |
| 432 }; | 432 }; |
| 433 | 433 |
| 434 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 434 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |