| 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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 void ShowFirstRunBubbleInternal(); | 434 void ShowFirstRunBubbleInternal(); |
| 435 | 435 |
| 436 // Draw the background and the left border. | 436 // Draw the background and the left border. |
| 437 void PaintActionBoxBackground(gfx::Canvas* canvas, | 437 void PaintActionBoxBackground(gfx::Canvas* canvas, |
| 438 const gfx::Rect& content_rect); | 438 const gfx::Rect& content_rect); |
| 439 | 439 |
| 440 // Draw backgrounds and borders for page actions. Must be called | 440 // Draw backgrounds and borders for page actions. Must be called |
| 441 // after layout, so the |page_action_views_| have their bounds. | 441 // after layout, so the |page_action_views_| have their bounds. |
| 442 void PaintPageActionBackgrounds(gfx::Canvas* canvas); | 442 void PaintPageActionBackgrounds(gfx::Canvas* canvas); |
| 443 | 443 |
| 444 // Draw the focus border when the search mode is |NTP|. |
| 445 void PaintSearchNTPFocusBorder(gfx::Canvas* canvas); |
| 446 |
| 444 #if defined(USE_AURA) | 447 #if defined(USE_AURA) |
| 445 // Fade in the location bar view so the icons come in gradually. | 448 // Fade in the location bar view so the icons come in gradually. |
| 446 void StartFadeAnimation(); | 449 void StartFadeAnimation(); |
| 447 | 450 |
| 448 // Stops the fade animation, if it is playing. Otherwise does nothing. | 451 // Stops the fade animation, if it is playing. Otherwise does nothing. |
| 449 void StopFadeAnimation(); | 452 void StopFadeAnimation(); |
| 450 | 453 |
| 451 // Cleans up layers used for the animation. | 454 // Cleans up layers used for the animation. |
| 452 void CleanupFadeAnimation(); | 455 void CleanupFadeAnimation(); |
| 453 #endif | 456 #endif |
| (...skipping 29 matching lines...) Expand all Loading... |
| 483 // The user's desired disposition for how their input should be opened | 486 // The user's desired disposition for how their input should be opened |
| 484 WindowOpenDisposition disposition_; | 487 WindowOpenDisposition disposition_; |
| 485 | 488 |
| 486 // The transition type to use for the navigation | 489 // The transition type to use for the navigation |
| 487 content::PageTransition transition_; | 490 content::PageTransition transition_; |
| 488 | 491 |
| 489 // Font used by edit and some of the hints. | 492 // Font used by edit and some of the hints. |
| 490 gfx::Font font_; | 493 gfx::Font font_; |
| 491 | 494 |
| 492 // An object used to paint the normal-mode background. | 495 // An object used to paint the normal-mode background. |
| 493 scoped_ptr<views::Painter> painter_; | 496 scoped_ptr<views::Painter> background_painter_; |
| 497 |
| 498 // An object used to paint the focus border when search mode is |NTP|. |
| 499 scoped_ptr<views::Painter> search_focus_painter_; |
| 494 | 500 |
| 495 // An icon to the left of the edit field. | 501 // An icon to the left of the edit field. |
| 496 LocationIconView* location_icon_view_; | 502 LocationIconView* location_icon_view_; |
| 497 | 503 |
| 498 // A bubble displayed for EV HTTPS sites. | 504 // A bubble displayed for EV HTTPS sites. |
| 499 EVBubbleView* ev_bubble_view_; | 505 EVBubbleView* ev_bubble_view_; |
| 500 | 506 |
| 501 // Location_entry view | 507 // Location_entry view |
| 502 views::View* location_entry_view_; | 508 views::View* location_entry_view_; |
| 503 | 509 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 570 | 576 |
| 571 #if defined(USE_AURA) | 577 #if defined(USE_AURA) |
| 572 // Observer for a fade-in animation. | 578 // Observer for a fade-in animation. |
| 573 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; | 579 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; |
| 574 #endif | 580 #endif |
| 575 | 581 |
| 576 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); | 582 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); |
| 577 }; | 583 }; |
| 578 | 584 |
| 579 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 585 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |