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 <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
623 content::SiteInstance* source_site_instance, | 623 content::SiteInstance* source_site_instance, |
624 int32_t route_id, | 624 int32_t route_id, |
625 int32_t main_frame_route_id, | 625 int32_t main_frame_route_id, |
626 int32_t main_frame_widget_route_id, | 626 int32_t main_frame_widget_route_id, |
627 content::mojom::WindowContainerType window_container_type, | 627 content::mojom::WindowContainerType window_container_type, |
628 const GURL& opener_url, | 628 const GURL& opener_url, |
629 const std::string& frame_name, | 629 const std::string& frame_name, |
630 const GURL& target_url, | 630 const GURL& target_url, |
631 const std::string& partition_id, | 631 const std::string& partition_id, |
632 content::SessionStorageNamespace* session_storage_namespace) override; | 632 content::SessionStorageNamespace* session_storage_namespace) override; |
633 void WebContentsCreated(content::WebContents* source_contents, | 633 void WebContentsCreated( |
634 int opener_render_process_id, | 634 content::WebContents* source_contents, |
635 int opener_render_frame_id, | 635 int opener_render_process_id, |
636 const std::string& frame_name, | 636 int opener_render_frame_id, |
637 const GURL& target_url, | 637 const std::string& frame_name, |
638 content::WebContents* new_contents) override; | 638 const GURL& target_url, |
| 639 content::WebContents* new_contents, |
| 640 const base::Optional<content::WebContents::CreateParams>& create_params) |
| 641 override; |
639 void RendererUnresponsive( | 642 void RendererUnresponsive( |
640 content::WebContents* source, | 643 content::WebContents* source, |
641 const content::WebContentsUnresponsiveState& unresponsive_state) override; | 644 const content::WebContentsUnresponsiveState& unresponsive_state) override; |
642 void RendererResponsive(content::WebContents* source) override; | 645 void RendererResponsive(content::WebContents* source) override; |
643 void DidNavigateMainFramePostCommit( | 646 void DidNavigateMainFramePostCommit( |
644 content::WebContents* web_contents) override; | 647 content::WebContents* web_contents) override; |
645 content::JavaScriptDialogManager* GetJavaScriptDialogManager( | 648 content::JavaScriptDialogManager* GetJavaScriptDialogManager( |
646 content::WebContents* source) override; | 649 content::WebContents* source) override; |
647 content::ColorChooser* OpenColorChooser( | 650 content::ColorChooser* OpenColorChooser( |
648 content::WebContents* web_contents, | 651 content::WebContents* web_contents, |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1009 // The following factory is used for chrome update coalescing. | 1012 // The following factory is used for chrome update coalescing. |
1010 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1013 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
1011 | 1014 |
1012 // The following factory is used to close the frame at a later time. | 1015 // The following factory is used to close the frame at a later time. |
1013 base::WeakPtrFactory<Browser> weak_factory_; | 1016 base::WeakPtrFactory<Browser> weak_factory_; |
1014 | 1017 |
1015 DISALLOW_COPY_AND_ASSIGN(Browser); | 1018 DISALLOW_COPY_AND_ASSIGN(Browser); |
1016 }; | 1019 }; |
1017 | 1020 |
1018 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1021 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |