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 11 matching lines...) Expand all Loading... |
22 #include "components/search_engines/template_url_service_observer.h" | 22 #include "components/search_engines/template_url_service_observer.h" |
23 #include "content/public/browser/notification_observer.h" | 23 #include "content/public/browser/notification_observer.h" |
24 #include "content/public/browser/notification_registrar.h" | 24 #include "content/public/browser/notification_registrar.h" |
25 #include "ui/gfx/animation/animation_delegate.h" | 25 #include "ui/gfx/animation/animation_delegate.h" |
26 #include "ui/gfx/font.h" | 26 #include "ui/gfx/font.h" |
27 #include "ui/gfx/rect.h" | 27 #include "ui/gfx/rect.h" |
28 #include "ui/views/controls/button/button.h" | 28 #include "ui/views/controls/button/button.h" |
29 #include "ui/views/drag_controller.h" | 29 #include "ui/views/drag_controller.h" |
30 | 30 |
31 class ActionBoxButtonView; | 31 class ActionBoxButtonView; |
32 class AddToAppLauncherView; | |
33 class CommandUpdater; | 32 class CommandUpdater; |
34 class ContentSettingBubbleModelDelegate; | 33 class ContentSettingBubbleModelDelegate; |
35 class ContentSettingImageView; | 34 class ContentSettingImageView; |
36 class EVBubbleView; | 35 class EVBubbleView; |
37 class ExtensionAction; | 36 class ExtensionAction; |
38 class GURL; | 37 class GURL; |
39 class GeneratedCreditCardView; | 38 class GeneratedCreditCardView; |
40 class InstantController; | 39 class InstantController; |
41 class KeywordHintView; | 40 class KeywordHintView; |
42 class LocationIconView; | 41 class LocationIconView; |
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
480 | 479 |
481 // The current page actions. | 480 // The current page actions. |
482 PageActions page_actions_; | 481 PageActions page_actions_; |
483 | 482 |
484 // The page action icon views. | 483 // The page action icon views. |
485 PageActionViews page_action_views_; | 484 PageActionViews page_action_views_; |
486 | 485 |
487 // The icon for Translate. | 486 // The icon for Translate. |
488 TranslateIconView* translate_icon_view_; | 487 TranslateIconView* translate_icon_view_; |
489 | 488 |
490 // The view to add pages to the app launcher. | |
491 AddToAppLauncherView* add_to_app_launcher_view_; | |
492 | |
493 // The star. | 489 // The star. |
494 StarView* star_view_; | 490 StarView* star_view_; |
495 | 491 |
496 // The search/go button. | 492 // The search/go button. |
497 SearchButton* search_button_; | 493 SearchButton* search_button_; |
498 | 494 |
499 // Whether we're in popup mode. This value also controls whether the location | 495 // Whether we're in popup mode. This value also controls whether the location |
500 // bar is read-only. | 496 // bar is read-only. |
501 const bool is_popup_mode_; | 497 const bool is_popup_mode_; |
502 | 498 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 int current_omnibox_width_; | 553 int current_omnibox_width_; |
558 int ending_omnibox_width_; | 554 int ending_omnibox_width_; |
559 | 555 |
560 // Used to register for notifications received by NotificationObserver. | 556 // Used to register for notifications received by NotificationObserver. |
561 content::NotificationRegistrar registrar_; | 557 content::NotificationRegistrar registrar_; |
562 | 558 |
563 DISALLOW_COPY_AND_ASSIGN(LocationBarView); | 559 DISALLOW_COPY_AND_ASSIGN(LocationBarView); |
564 }; | 560 }; |
565 | 561 |
566 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 562 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
OLD | NEW |