| 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 // Overridden from views::View: | 428 // Overridden from views::View: |
| 429 virtual std::string GetClassName() const OVERRIDE; | 429 virtual std::string GetClassName() const OVERRIDE; |
| 430 virtual void Layout() OVERRIDE; | 430 virtual void Layout() OVERRIDE; |
| 431 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE; | 431 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE; |
| 432 virtual void ViewHierarchyChanged(bool is_add, | 432 virtual void ViewHierarchyChanged(bool is_add, |
| 433 views::View* parent, | 433 views::View* parent, |
| 434 views::View* child) OVERRIDE; | 434 views::View* child) OVERRIDE; |
| 435 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; | 435 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; |
| 436 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; | 436 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; |
| 437 | 437 |
| 438 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; } |
| 439 // TODO(jamescook): Rename |contents_| and |contents_container_|. |
| 440 ContentsContainer* GetContentsContainerForTest() { return contents_; } |
| 441 views::WebView* GetContentsWebViewForTest() { return contents_container_; } |
| 442 |
| 438 protected: | 443 protected: |
| 439 // Appends to |toolbars| a pointer to each AccessiblePaneView that | 444 // Appends to |toolbars| a pointer to each AccessiblePaneView that |
| 440 // can be traversed using F6, in the order they should be traversed. | 445 // can be traversed using F6, in the order they should be traversed. |
| 441 // Abstracted here so that it can be extended for Chrome OS. | 446 // Abstracted here so that it can be extended for Chrome OS. |
| 442 void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes); | 447 void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes); |
| 443 | 448 |
| 444 // Browser window related initializations. | 449 // Browser window related initializations. |
| 445 void Init(); | 450 void Init(); |
| 446 | 451 |
| 447 // Callback for the loading animation(s) associated with this view. | 452 // Callback for the loading animation(s) associated with this view. |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 643 // non-tabbed browsers like popups. May not be visible. | 648 // non-tabbed browsers like popups. May not be visible. |
| 644 scoped_ptr<BookmarkBarView> bookmark_bar_view_; | 649 scoped_ptr<BookmarkBarView> bookmark_bar_view_; |
| 645 | 650 |
| 646 // The download shelf view (view at the bottom of the page). | 651 // The download shelf view (view at the bottom of the page). |
| 647 scoped_ptr<DownloadShelfView> download_shelf_; | 652 scoped_ptr<DownloadShelfView> download_shelf_; |
| 648 | 653 |
| 649 // The InfoBarContainerView that contains InfoBars for the current tab. | 654 // The InfoBarContainerView that contains InfoBars for the current tab. |
| 650 InfoBarContainerView* infobar_container_; | 655 InfoBarContainerView* infobar_container_; |
| 651 | 656 |
| 652 // The view that contains the selected WebContents. | 657 // The view that contains the selected WebContents. |
| 658 // TODO(jamescook): Rename this to |contents_web_view_| in order to |
| 659 // reduce confusion with ContentsContainer |contents_| below. |
| 653 views::WebView* contents_container_; | 660 views::WebView* contents_container_; |
| 654 | 661 |
| 655 // The view that contains devtools window for the selected WebContents. | 662 // The view that contains devtools window for the selected WebContents. |
| 656 views::WebView* devtools_container_; | 663 views::WebView* devtools_container_; |
| 657 | 664 |
| 658 // The view managing both the contents_container_ and | 665 // The view managing both the contents_container_ and |
| 659 // overlay_controller_->overlay_container_. | 666 // overlay_controller_->overlay_container_. |
| 660 ContentsContainer* contents_; | 667 ContentsContainer* contents_; |
| 661 | 668 |
| 662 // Split view containing the contents container and devtools container. | 669 // Split view containing the contents container and devtools container. |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 gfx::ScopedSysColorChangeListener color_change_listener_; | 743 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 737 | 744 |
| 738 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; | 745 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; |
| 739 | 746 |
| 740 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 747 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 741 | 748 |
| 742 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 749 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 743 }; | 750 }; |
| 744 | 751 |
| 745 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 752 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |