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_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 bool* proceed_to_fire_unload) override; | 573 bool* proceed_to_fire_unload) override; |
574 bool ShouldFocusLocationBarByDefault(content::WebContents* source) override; | 574 bool ShouldFocusLocationBarByDefault(content::WebContents* source) override; |
575 void ViewSourceForTab(content::WebContents* source, | 575 void ViewSourceForTab(content::WebContents* source, |
576 const GURL& page_url) override; | 576 const GURL& page_url) override; |
577 void ViewSourceForFrame(content::WebContents* source, | 577 void ViewSourceForFrame(content::WebContents* source, |
578 const GURL& frame_url, | 578 const GURL& frame_url, |
579 const content::PageState& frame_page_state) override; | 579 const content::PageState& frame_page_state) override; |
580 void ShowRepostFormWarningDialog(content::WebContents* source) override; | 580 void ShowRepostFormWarningDialog(content::WebContents* source) override; |
581 bool ShouldCreateWebContents( | 581 bool ShouldCreateWebContents( |
582 content::WebContents* web_contents, | 582 content::WebContents* web_contents, |
583 int route_id, | 583 int32 route_id, |
584 int main_frame_route_id, | 584 int32 main_frame_route_id, |
| 585 int32 main_frame_widget_route_id, |
585 WindowContainerType window_container_type, | 586 WindowContainerType window_container_type, |
586 const std::string& frame_name, | 587 const std::string& frame_name, |
587 const GURL& target_url, | 588 const GURL& target_url, |
588 const std::string& partition_id, | 589 const std::string& partition_id, |
589 content::SessionStorageNamespace* session_storage_namespace) override; | 590 content::SessionStorageNamespace* session_storage_namespace) override; |
590 void WebContentsCreated(content::WebContents* source_contents, | 591 void WebContentsCreated(content::WebContents* source_contents, |
591 int opener_render_frame_id, | 592 int opener_render_frame_id, |
592 const std::string& frame_name, | 593 const std::string& frame_name, |
593 const GURL& target_url, | 594 const GURL& target_url, |
594 content::WebContents* new_contents) override; | 595 content::WebContents* new_contents) override; |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
815 | 816 |
816 // Resets |bookmark_bar_state_| based on the active tab. Notifies the | 817 // Resets |bookmark_bar_state_| based on the active tab. Notifies the |
817 // BrowserWindow if necessary. | 818 // BrowserWindow if necessary. |
818 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); | 819 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); |
819 | 820 |
820 bool ShouldHideUIForFullscreen() const; | 821 bool ShouldHideUIForFullscreen() const; |
821 | 822 |
822 // Creates a BackgroundContents if appropriate; return true if one was | 823 // Creates a BackgroundContents if appropriate; return true if one was |
823 // created. | 824 // created. |
824 bool MaybeCreateBackgroundContents( | 825 bool MaybeCreateBackgroundContents( |
825 int route_id, | 826 int32 route_id, |
826 int main_frame_route_id, | 827 int32 main_frame_route_id, |
| 828 int32 main_frame_widget_route_id, |
827 content::WebContents* opener_web_contents, | 829 content::WebContents* opener_web_contents, |
828 const std::string& frame_name, | 830 const std::string& frame_name, |
829 const GURL& target_url, | 831 const GURL& target_url, |
830 const std::string& partition_id, | 832 const std::string& partition_id, |
831 content::SessionStorageNamespace* session_storage_namespace); | 833 content::SessionStorageNamespace* session_storage_namespace); |
832 | 834 |
833 // Data members ///////////////////////////////////////////////////////////// | 835 // Data members ///////////////////////////////////////////////////////////// |
834 | 836 |
835 std::vector<InterstitialObserver*> interstitial_observers_; | 837 std::vector<InterstitialObserver*> interstitial_observers_; |
836 | 838 |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
972 // The following factory is used for chrome update coalescing. | 974 // The following factory is used for chrome update coalescing. |
973 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 975 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
974 | 976 |
975 // The following factory is used to close the frame at a later time. | 977 // The following factory is used to close the frame at a later time. |
976 base::WeakPtrFactory<Browser> weak_factory_; | 978 base::WeakPtrFactory<Browser> weak_factory_; |
977 | 979 |
978 DISALLOW_COPY_AND_ASSIGN(Browser); | 980 DISALLOW_COPY_AND_ASSIGN(Browser); |
979 }; | 981 }; |
980 | 982 |
981 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 983 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |