| 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 <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 // view: http://dev.chromium.org/developers/design-documents/browser-window | 40 // view: http://dev.chromium.org/developers/design-documents/browser-window |
| 41 | 41 |
| 42 class BookmarkBarView; | 42 class BookmarkBarView; |
| 43 class Browser; | 43 class Browser; |
| 44 class BrowserViewLayout; | 44 class BrowserViewLayout; |
| 45 class ContentsContainer; | 45 class ContentsContainer; |
| 46 class DownloadShelfView; | 46 class DownloadShelfView; |
| 47 class FullscreenExitBubbleViews; | 47 class FullscreenExitBubbleViews; |
| 48 class ImmersiveModeController; | 48 class ImmersiveModeController; |
| 49 class InfoBarContainerView; | 49 class InfoBarContainerView; |
| 50 class InstantPreviewControllerViews; | 50 class InstantOverlayControllerViews; |
| 51 class LocationBarView; | 51 class LocationBarView; |
| 52 class StatusBubbleViews; | 52 class StatusBubbleViews; |
| 53 class SearchViewController; | 53 class SearchViewController; |
| 54 class TabStrip; | 54 class TabStrip; |
| 55 class TabStripModel; | 55 class TabStripModel; |
| 56 class ToolbarView; | 56 class ToolbarView; |
| 57 | 57 |
| 58 #if defined(OS_WIN) | 58 #if defined(OS_WIN) |
| 59 class JumpList; | 59 class JumpList; |
| 60 #endif | 60 #endif |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 612 // |------------------------------------------------------------------| | 612 // |------------------------------------------------------------------| |
| 613 // | All infobars (infobar_container_) [2] | | 613 // | All infobars (infobar_container_) [2] | |
| 614 // |------------------------------------------------------------------| | 614 // |------------------------------------------------------------------| |
| 615 // | Bookmarks (bookmark_bar_view_) [2] | | 615 // | Bookmarks (bookmark_bar_view_) [2] | |
| 616 // |------------------------------------------------------------------| | 616 // |------------------------------------------------------------------| |
| 617 // | Debugger splitter (contents_split_) | | 617 // | Debugger splitter (contents_split_) | |
| 618 // | +------------------------------------------------------------+ | | 618 // | +------------------------------------------------------------+ | |
| 619 // | | Page content (contents_) | | | 619 // | | Page content (contents_) | | |
| 620 // | | +------------------------------------------------------+ | | | 620 // | | +------------------------------------------------------+ | | |
| 621 // | | | contents_container_ and/or | | | | 621 // | | | contents_container_ and/or | | | |
| 622 // | | | preview_controller_->preview_container_ | | | | 622 // | | | overlay_controller_->overlay_container_ | | | |
| 623 // | | | | | | | 623 // | | | | | | |
| 624 // | | | | | | | 624 // | | | | | | |
| 625 // | | +------------------------------------------------------+ | | | 625 // | | +------------------------------------------------------+ | | |
| 626 // | +------------------------------------------------------------+ | | 626 // | +------------------------------------------------------------+ | |
| 627 // | +------------------------------------------------------------+ | | 627 // | +------------------------------------------------------------+ | |
| 628 // | | Debugger (devtools_container_) | | | 628 // | | Debugger (devtools_container_) | | |
| 629 // | | | | | 629 // | | | | |
| 630 // | +------------------------------------------------------------+ | | 630 // | +------------------------------------------------------------+ | |
| 631 // |------------------------------------------------------------------| | 631 // |------------------------------------------------------------------| |
| 632 // | Active downloads (download_shelf_) | | 632 // | Active downloads (download_shelf_) | |
| 633 // -------------------------------------------------------------------- | 633 // -------------------------------------------------------------------- |
| 634 // | 634 // |
| 635 // [1] During an immersive mode reveal the tab strip and toolbar may be | 635 // [1] During an immersive mode reveal the tab strip and toolbar may be |
| 636 // reparented to a temporary view and may not be direct children of | 636 // reparented to a temporary view and may not be direct children of |
| 637 // this view. | 637 // this view. |
| 638 // [2] The bookmark bar and info bar are swapped when on the new tab page. | 638 // [2] The bookmark bar and info bar are swapped when on the new tab page. |
| 639 // Additionally contents_ is positioned on top of the bookmark bar when | 639 // Additionally contents_ is positioned on top of the bookmark bar when |
| 640 // the bookmark bar is detached. This is done to allow the | 640 // the bookmark bar is detached. This is done to allow the |
| 641 // preview_controller_->preview_container_ to appear over the bookmark | 641 // overlay_controller_->overlay_container_ to appear over the bookmark |
| 642 // bar. | 642 // bar. |
| 643 | 643 |
| 644 // Tool/Info bars that we are currently showing. Used for layout. | 644 // Tool/Info bars that we are currently showing. Used for layout. |
| 645 // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing, | 645 // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing, |
| 646 // or is bookmark_bar_view_ if the bookmark bar is showing. | 646 // or is bookmark_bar_view_ if the bookmark bar is showing. |
| 647 views::View* active_bookmark_bar_; | 647 views::View* active_bookmark_bar_; |
| 648 | 648 |
| 649 // The TabStrip. | 649 // The TabStrip. |
| 650 TabStrip* tabstrip_; | 650 TabStrip* tabstrip_; |
| 651 | 651 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 666 // The InfoBarContainerView that contains InfoBars for the current tab. | 666 // The InfoBarContainerView that contains InfoBars for the current tab. |
| 667 InfoBarContainerView* infobar_container_; | 667 InfoBarContainerView* infobar_container_; |
| 668 | 668 |
| 669 // The view that contains the selected WebContents. | 669 // The view that contains the selected WebContents. |
| 670 views::WebView* contents_container_; | 670 views::WebView* contents_container_; |
| 671 | 671 |
| 672 // The view that contains devtools window for the selected WebContents. | 672 // The view that contains devtools window for the selected WebContents. |
| 673 views::WebView* devtools_container_; | 673 views::WebView* devtools_container_; |
| 674 | 674 |
| 675 // The view managing both the contents_container_ and | 675 // The view managing both the contents_container_ and |
| 676 // preview_controller_->preview_container_. | 676 // overlay_controller_->overlay_container_. |
| 677 ContentsContainer* contents_; | 677 ContentsContainer* contents_; |
| 678 | 678 |
| 679 // Split view containing the contents container and devtools container. | 679 // Split view containing the contents container and devtools container. |
| 680 views::SingleSplitView* contents_split_; | 680 views::SingleSplitView* contents_split_; |
| 681 | 681 |
| 682 // Side to dock devtools to. | 682 // Side to dock devtools to. |
| 683 DevToolsDockSide devtools_dock_side_; | 683 DevToolsDockSide devtools_dock_side_; |
| 684 | 684 |
| 685 // Docked devtools window instance. NULL when current tab is not inspected | 685 // Docked devtools window instance. NULL when current tab is not inspected |
| 686 // or is inspected with undocked version of DevToolsWindow. | 686 // or is inspected with undocked version of DevToolsWindow. |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 745 // If this flag is set then SetFocusToLocationBar() will set focus to the | 745 // If this flag is set then SetFocusToLocationBar() will set focus to the |
| 746 // location bar even if the browser window is not active. | 746 // location bar even if the browser window is not active. |
| 747 bool force_location_bar_focus_; | 747 bool force_location_bar_focus_; |
| 748 | 748 |
| 749 PendingFullscreenRequest fullscreen_request_; | 749 PendingFullscreenRequest fullscreen_request_; |
| 750 | 750 |
| 751 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; | 751 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; |
| 752 | 752 |
| 753 gfx::ScopedSysColorChangeListener color_change_listener_; | 753 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 754 | 754 |
| 755 scoped_ptr<InstantPreviewControllerViews> preview_controller_; | 755 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; |
| 756 | 756 |
| 757 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 757 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 758 | 758 |
| 759 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 759 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 760 }; | 760 }; |
| 761 | 761 |
| 762 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 762 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |