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 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
492 // Browser type) and there should be a subsequent re-layout to show it. | 492 // Browser type) and there should be a subsequent re-layout to show it. |
493 // |contents| can be NULL. | 493 // |contents| can be NULL. |
494 bool MaybeShowBookmarkBar(TabContents* contents); | 494 bool MaybeShowBookmarkBar(TabContents* contents); |
495 | 495 |
496 // Prepare to show an Info Bar for the specified TabContents. Returns | 496 // Prepare to show an Info Bar for the specified TabContents. Returns |
497 // true if there is an Info Bar to show and one is supported for this Browser | 497 // true if there is an Info Bar to show and one is supported for this Browser |
498 // type, and there should be a subsequent re-layout to show it. | 498 // type, and there should be a subsequent re-layout to show it. |
499 // |contents| can be NULL. | 499 // |contents| can be NULL. |
500 bool MaybeShowInfoBar(TabContents* contents); | 500 bool MaybeShowInfoBar(TabContents* contents); |
501 | 501 |
502 // Updated devtools window for given contents. | |
Peter Kasting
2012/10/24 21:18:09
Nit: Updated -> Update? What does "Update dev too
pfeldman
2012/10/25 15:17:40
Done. Added comment.
| |
503 void UpdateDevToolsForContents(TabContents* tab_contents); | |
504 | |
502 // Shows docked devtools. | 505 // Shows docked devtools. |
503 void ShowDevToolsContainer(DevToolsDockSide side); | 506 void ShowDevToolsContainer(); |
504 | 507 |
505 // Hides docked devtools. | 508 // Hides docked devtools. |
506 void HideDevToolsContainer(); | 509 void HideDevToolsContainer(); |
507 | 510 |
508 // Updates devtools dock side. | 511 // Updates docked devtools size. |
Peter Kasting
2012/10/24 21:18:09
Nit: Again, "updates" is too vague. What does thi
pfeldman
2012/10/25 15:17:40
Done.
| |
509 void SetDevToolsDockSide(DevToolsDockSide side); | 512 void UpdateDevToolsSplitPosition(); |
510 | |
511 // Updated devtools window for given contents. | |
512 void UpdateDevToolsForContents(TabContents* tab_contents); | |
513 | 513 |
514 // Updates various optional child Views, e.g. Bookmarks Bar, Info Bar or the | 514 // Updates various optional child Views, e.g. Bookmarks Bar, Info Bar or the |
515 // Download Shelf in response to a change notification from the specified | 515 // Download Shelf in response to a change notification from the specified |
516 // |contents|. |contents| can be NULL. In this case, all optional UI will be | 516 // |contents|. |contents| can be NULL. In this case, all optional UI will be |
517 // removed. | 517 // removed. |
518 void UpdateUIForContents(TabContents* contents); | 518 void UpdateUIForContents(TabContents* contents); |
519 | 519 |
520 // Updates an optional child View, e.g. Bookmarks Bar, Info Bar, Download | 520 // Updates an optional child View, e.g. Bookmarks Bar, Info Bar, Download |
521 // Shelf. If |*old_view| differs from new_view, the old_view is removed and | 521 // Shelf. If |*old_view| differs from new_view, the old_view is removed and |
522 // the new_view is added. This is intended to be used when swapping in/out | 522 // the new_view is added. This is intended to be used when swapping in/out |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
652 // The view that contains devtools window for the selected WebContents. | 652 // The view that contains devtools window for the selected WebContents. |
653 views::WebView* devtools_container_; | 653 views::WebView* devtools_container_; |
654 | 654 |
655 // The view managing both the contents_container_ and | 655 // The view managing both the contents_container_ and |
656 // preview_controller_->preview_container_. | 656 // preview_controller_->preview_container_. |
657 ContentsContainer* contents_; | 657 ContentsContainer* contents_; |
658 | 658 |
659 // Split view containing the contents container and devtools container. | 659 // Split view containing the contents container and devtools container. |
660 views::SingleSplitView* contents_split_; | 660 views::SingleSplitView* contents_split_; |
661 | 661 |
662 // Side to dock devtools to | 662 // Side to dock devtools to. |
663 DevToolsDockSide devtools_dock_side_; | 663 DevToolsDockSide devtools_dock_side_; |
664 | 664 |
665 // Docked devtools window instance. | |
Peter Kasting
2012/10/24 21:18:09
Can this be NULL?
pfeldman
2012/10/25 15:17:40
Done.
| |
666 DevToolsWindow* devtools_window_; | |
667 | |
665 // Tracks and stores the last focused view which is not the | 668 // Tracks and stores the last focused view which is not the |
666 // devtools_container_ or any of its children. Used to restore focus once | 669 // devtools_container_ or any of its children. Used to restore focus once |
667 // the devtools_container_ is hidden. | 670 // the devtools_container_ is hidden. |
668 scoped_ptr<views::ExternalFocusTracker> devtools_focus_tracker_; | 671 scoped_ptr<views::ExternalFocusTracker> devtools_focus_tracker_; |
669 | 672 |
670 // The Status information bubble that appears at the bottom of the window. | 673 // The Status information bubble that appears at the bottom of the window. |
671 scoped_ptr<StatusBubbleViews> status_bubble_; | 674 scoped_ptr<StatusBubbleViews> status_bubble_; |
672 | 675 |
673 // A mapping between accelerators and commands. | 676 // A mapping between accelerators and commands. |
674 std::map<ui::Accelerator, int> accelerator_table_; | 677 std::map<ui::Accelerator, int> accelerator_table_; |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
723 scoped_ptr<SearchViewController> search_view_controller_; | 726 scoped_ptr<SearchViewController> search_view_controller_; |
724 | 727 |
725 scoped_ptr<InstantPreviewControllerViews> preview_controller_; | 728 scoped_ptr<InstantPreviewControllerViews> preview_controller_; |
726 | 729 |
727 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 730 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
728 | 731 |
729 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 732 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
730 }; | 733 }; |
731 | 734 |
732 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 735 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |