Chromium Code Reviews| 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_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" | 43 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" |
| 44 #include "ui/views/widget/widget_delegate.h" | 44 #include "ui/views/widget/widget_delegate.h" |
| 45 #include "ui/views/widget/widget_observer.h" | 45 #include "ui/views/widget/widget_observer.h" |
| 46 #include "ui/views/window/client_view.h" | 46 #include "ui/views/window/client_view.h" |
| 47 | 47 |
| 48 // NOTE: For more information about the objects and files in this directory, | 48 // NOTE: For more information about the objects and files in this directory, |
| 49 // view: http://dev.chromium.org/developers/design-documents/browser-window | 49 // view: http://dev.chromium.org/developers/design-documents/browser-window |
| 50 | 50 |
| 51 class BookmarkBarView; | 51 class BookmarkBarView; |
| 52 class Browser; | 52 class Browser; |
| 53 class BrowserViewHistogramHelper; | |
| 53 class BrowserViewLayout; | 54 class BrowserViewLayout; |
| 54 class ContentsLayoutManager; | 55 class ContentsLayoutManager; |
| 55 class DownloadShelfView; | 56 class DownloadShelfView; |
| 56 class ExclusiveAccessBubbleViews; | 57 class ExclusiveAccessBubbleViews; |
| 57 class InfoBarContainerView; | 58 class InfoBarContainerView; |
| 58 class LocationBarView; | 59 class LocationBarView; |
| 59 class NewBackShortcutBubble; | 60 class NewBackShortcutBubble; |
| 60 class StatusBubbleViews; | 61 class StatusBubbleViews; |
| 61 class TabStrip; | 62 class TabStrip; |
| 62 class ToolbarView; | 63 class ToolbarView; |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 431 SkColor GetInfoBarSeparatorColor() const override; | 432 SkColor GetInfoBarSeparatorColor() const override; |
| 432 void InfoBarContainerStateChanged(bool is_animating) override; | 433 void InfoBarContainerStateChanged(bool is_animating) override; |
| 433 bool DrawInfoBarArrows(int* x) const override; | 434 bool DrawInfoBarArrows(int* x) const override; |
| 434 | 435 |
| 435 // Overridden from views::View: | 436 // Overridden from views::View: |
| 436 const char* GetClassName() const override; | 437 const char* GetClassName() const override; |
| 437 void Layout() override; | 438 void Layout() override; |
| 438 void OnGestureEvent(ui::GestureEvent* event) override; | 439 void OnGestureEvent(ui::GestureEvent* event) override; |
| 439 void ViewHierarchyChanged( | 440 void ViewHierarchyChanged( |
| 440 const ViewHierarchyChangedDetails& details) override; | 441 const ViewHierarchyChangedDetails& details) override; |
| 442 void PaintChildren(const ui::PaintContext& context) override; | |
| 441 void ChildPreferredSizeChanged(View* child) override; | 443 void ChildPreferredSizeChanged(View* child) override; |
| 442 void GetAccessibleNodeData(ui::AXNodeData* node_data) override; | 444 void GetAccessibleNodeData(ui::AXNodeData* node_data) override; |
| 443 void OnThemeChanged() override; | 445 void OnThemeChanged() override; |
| 444 | 446 |
| 445 // Overridden from ui::AcceleratorTarget: | 447 // Overridden from ui::AcceleratorTarget: |
| 446 bool AcceleratorPressed(const ui::Accelerator& accelerator) override; | 448 bool AcceleratorPressed(const ui::Accelerator& accelerator) override; |
| 447 | 449 |
| 448 // OmniboxPopupModelObserver overrides | 450 // OmniboxPopupModelObserver overrides |
| 449 void OnOmniboxPopupShownOrHidden() override; | 451 void OnOmniboxPopupShownOrHidden() override; |
| 450 | 452 |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 707 std::unique_ptr<ImmersiveModeController> immersive_mode_controller_; | 709 std::unique_ptr<ImmersiveModeController> immersive_mode_controller_; |
| 708 | 710 |
| 709 std::unique_ptr<WebContentsCloseHandler> web_contents_close_handler_; | 711 std::unique_ptr<WebContentsCloseHandler> web_contents_close_handler_; |
| 710 | 712 |
| 711 SigninViewController signin_view_controller_; | 713 SigninViewController signin_view_controller_; |
| 712 | 714 |
| 713 // The class that registers for keyboard shortcuts for extension commands. | 715 // The class that registers for keyboard shortcuts for extension commands. |
| 714 std::unique_ptr<ExtensionKeybindingRegistryViews> | 716 std::unique_ptr<ExtensionKeybindingRegistryViews> |
| 715 extension_keybinding_registry_; | 717 extension_keybinding_registry_; |
| 716 | 718 |
| 719 std::unique_ptr<BrowserViewHistogramHelper> histogram_helper_; | |
|
tapted
2017/04/07 00:49:34
Same here - I don't think this needs to be a point
themblsha
2017/04/10 17:28:18
Ok, removed unique_ptr :-)
| |
| 720 | |
| 717 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 721 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 718 | 722 |
| 719 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 723 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 720 }; | 724 }; |
| 721 | 725 |
| 722 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 726 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |