| OLD | NEW |
| 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_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 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 // The user's desired disposition for how their input should be opened | 479 // The user's desired disposition for how their input should be opened |
| 480 WindowOpenDisposition disposition_; | 480 WindowOpenDisposition disposition_; |
| 481 | 481 |
| 482 // The transition type to use for the navigation | 482 // The transition type to use for the navigation |
| 483 content::PageTransition transition_; | 483 content::PageTransition transition_; |
| 484 | 484 |
| 485 // Font used by edit and some of the hints. | 485 // Font used by edit and some of the hints. |
| 486 gfx::Font font_; | 486 gfx::Font font_; |
| 487 | 487 |
| 488 // An object used to paint the normal-mode background. | 488 // An object used to paint the normal-mode background. |
| 489 scoped_ptr<views::Painter> painter_; | 489 scoped_ptr<views::Painter> background_painter_; |
| 490 |
| 491 // An object used to paint the focus border when search mode is |NTP|. |
| 492 scoped_ptr<views::Painter> search_focus_painter_; |
| 490 | 493 |
| 491 // An icon to the left of the edit field. | 494 // An icon to the left of the edit field. |
| 492 LocationIconView* location_icon_view_; | 495 LocationIconView* location_icon_view_; |
| 493 | 496 |
| 494 // A bubble displayed for EV HTTPS sites. | 497 // A bubble displayed for EV HTTPS sites. |
| 495 EVBubbleView* ev_bubble_view_; | 498 EVBubbleView* ev_bubble_view_; |
| 496 | 499 |
| 497 // Location_entry view | 500 // Location_entry view |
| 498 views::View* location_entry_view_; | 501 views::View* location_entry_view_; |
| 499 | 502 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 | 569 |
| 567 #if defined(USE_AURA) | 570 #if defined(USE_AURA) |
| 568 // Observer for a fade-in animation. | 571 // Observer for a fade-in animation. |
| 569 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; | 572 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; |
| 570 #endif | 573 #endif |
| 571 | 574 |
| 572 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); | 575 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); |
| 573 }; | 576 }; |
| 574 | 577 |
| 575 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 578 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |