| 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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 bool* proceed_to_fire_unload) override; | 577 bool* proceed_to_fire_unload) override; |
| 578 bool ShouldFocusLocationBarByDefault(content::WebContents* source) override; | 578 bool ShouldFocusLocationBarByDefault(content::WebContents* source) override; |
| 579 void ViewSourceForTab(content::WebContents* source, | 579 void ViewSourceForTab(content::WebContents* source, |
| 580 const GURL& page_url) override; | 580 const GURL& page_url) override; |
| 581 void ViewSourceForFrame(content::WebContents* source, | 581 void ViewSourceForFrame(content::WebContents* source, |
| 582 const GURL& frame_url, | 582 const GURL& frame_url, |
| 583 const content::PageState& frame_page_state) override; | 583 const content::PageState& frame_page_state) override; |
| 584 void ShowRepostFormWarningDialog(content::WebContents* source) override; | 584 void ShowRepostFormWarningDialog(content::WebContents* source) override; |
| 585 bool ShouldCreateWebContents( | 585 bool ShouldCreateWebContents( |
| 586 content::WebContents* web_contents, | 586 content::WebContents* web_contents, |
| 587 int route_id, | 587 int32 route_id, |
| 588 int main_frame_route_id, | 588 int32 main_frame_route_id, |
| 589 int32 main_frame_widget_route_id, |
| 589 WindowContainerType window_container_type, | 590 WindowContainerType window_container_type, |
| 590 const std::string& frame_name, | 591 const std::string& frame_name, |
| 591 const GURL& target_url, | 592 const GURL& target_url, |
| 592 const std::string& partition_id, | 593 const std::string& partition_id, |
| 593 content::SessionStorageNamespace* session_storage_namespace) override; | 594 content::SessionStorageNamespace* session_storage_namespace) override; |
| 594 void WebContentsCreated(content::WebContents* source_contents, | 595 void WebContentsCreated(content::WebContents* source_contents, |
| 595 int opener_render_frame_id, | 596 int opener_render_frame_id, |
| 596 const std::string& frame_name, | 597 const std::string& frame_name, |
| 597 const GURL& target_url, | 598 const GURL& target_url, |
| 598 content::WebContents* new_contents) override; | 599 content::WebContents* new_contents) override; |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 | 826 |
| 826 bool ShouldHideUIForFullscreen() const; | 827 bool ShouldHideUIForFullscreen() const; |
| 827 | 828 |
| 828 // Returns true if we can start the shutdown sequence for the browser, i.e. | 829 // Returns true if we can start the shutdown sequence for the browser, i.e. |
| 829 // the last browser window is being closed. | 830 // the last browser window is being closed. |
| 830 bool ShouldStartShutdown() const; | 831 bool ShouldStartShutdown() const; |
| 831 | 832 |
| 832 // Creates a BackgroundContents if appropriate; return true if one was | 833 // Creates a BackgroundContents if appropriate; return true if one was |
| 833 // created. | 834 // created. |
| 834 bool MaybeCreateBackgroundContents( | 835 bool MaybeCreateBackgroundContents( |
| 835 int route_id, | 836 int32 route_id, |
| 836 int main_frame_route_id, | 837 int32 main_frame_route_id, |
| 838 int32 main_frame_widget_route_id, |
| 837 content::WebContents* opener_web_contents, | 839 content::WebContents* opener_web_contents, |
| 838 const std::string& frame_name, | 840 const std::string& frame_name, |
| 839 const GURL& target_url, | 841 const GURL& target_url, |
| 840 const std::string& partition_id, | 842 const std::string& partition_id, |
| 841 content::SessionStorageNamespace* session_storage_namespace); | 843 content::SessionStorageNamespace* session_storage_namespace); |
| 842 | 844 |
| 843 // Data members ///////////////////////////////////////////////////////////// | 845 // Data members ///////////////////////////////////////////////////////////// |
| 844 | 846 |
| 845 std::vector<InterstitialObserver*> interstitial_observers_; | 847 std::vector<InterstitialObserver*> interstitial_observers_; |
| 846 | 848 |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 984 // The following factory is used for chrome update coalescing. | 986 // The following factory is used for chrome update coalescing. |
| 985 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 987 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 986 | 988 |
| 987 // The following factory is used to close the frame at a later time. | 989 // The following factory is used to close the frame at a later time. |
| 988 base::WeakPtrFactory<Browser> weak_factory_; | 990 base::WeakPtrFactory<Browser> weak_factory_; |
| 989 | 991 |
| 990 DISALLOW_COPY_AND_ASSIGN(Browser); | 992 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 991 }; | 993 }; |
| 992 | 994 |
| 993 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 995 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |