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 12 matching lines...) Expand all Loading... |
23 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | 23 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
24 #include "content/public/browser/notification_observer.h" | 24 #include "content/public/browser/notification_observer.h" |
25 #include "content/public/browser/notification_registrar.h" | 25 #include "content/public/browser/notification_registrar.h" |
26 #include "ui/gfx/animation/animation_delegate.h" | 26 #include "ui/gfx/animation/animation_delegate.h" |
27 #include "ui/gfx/font.h" | 27 #include "ui/gfx/font.h" |
28 #include "ui/gfx/rect.h" | 28 #include "ui/gfx/rect.h" |
29 #include "ui/views/controls/button/button.h" | 29 #include "ui/views/controls/button/button.h" |
30 #include "ui/views/drag_controller.h" | 30 #include "ui/views/drag_controller.h" |
31 | 31 |
32 class ActionBoxButtonView; | 32 class ActionBoxButtonView; |
| 33 class AddToAppLauncherView; |
33 class CommandUpdater; | 34 class CommandUpdater; |
34 class ContentSettingBubbleModelDelegate; | 35 class ContentSettingBubbleModelDelegate; |
35 class ContentSettingImageView; | 36 class ContentSettingImageView; |
36 class EVBubbleView; | 37 class EVBubbleView; |
37 class ExtensionAction; | 38 class ExtensionAction; |
38 class GURL; | 39 class GURL; |
39 class GeneratedCreditCardView; | 40 class GeneratedCreditCardView; |
40 class InstantController; | 41 class InstantController; |
41 class KeywordHintView; | 42 class KeywordHintView; |
42 class LocationIconView; | 43 class LocationIconView; |
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
488 | 489 |
489 // The current page actions. | 490 // The current page actions. |
490 PageActions page_actions_; | 491 PageActions page_actions_; |
491 | 492 |
492 // The page action icon views. | 493 // The page action icon views. |
493 PageActionViews page_action_views_; | 494 PageActionViews page_action_views_; |
494 | 495 |
495 // The icon for Translate. | 496 // The icon for Translate. |
496 TranslateIconView* translate_icon_view_; | 497 TranslateIconView* translate_icon_view_; |
497 | 498 |
| 499 // The view to add pages to the app launcher. |
| 500 AddToAppLauncherView* add_to_app_launcher_view_; |
| 501 |
498 // The star. | 502 // The star. |
499 StarView* star_view_; | 503 StarView* star_view_; |
500 | 504 |
501 // The search/go button. | 505 // The search/go button. |
502 SearchButton* search_button_; | 506 SearchButton* search_button_; |
503 | 507 |
504 // Whether we're in popup mode. This value also controls whether the location | 508 // Whether we're in popup mode. This value also controls whether the location |
505 // bar is read-only. | 509 // bar is read-only. |
506 const bool is_popup_mode_; | 510 const bool is_popup_mode_; |
507 | 511 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
565 // Used to register for notifications received by NotificationObserver. | 569 // Used to register for notifications received by NotificationObserver. |
566 content::NotificationRegistrar registrar_; | 570 content::NotificationRegistrar registrar_; |
567 | 571 |
568 // Used to bind callback functions to this object. | 572 // Used to bind callback functions to this object. |
569 base::WeakPtrFactory<LocationBarView> weak_ptr_factory_; | 573 base::WeakPtrFactory<LocationBarView> weak_ptr_factory_; |
570 | 574 |
571 DISALLOW_COPY_AND_ASSIGN(LocationBarView); | 575 DISALLOW_COPY_AND_ASSIGN(LocationBarView); |
572 }; | 576 }; |
573 | 577 |
574 #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 |