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 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
628 content::SiteInstance* source_site_instance, | 628 content::SiteInstance* source_site_instance, |
629 int32_t route_id, | 629 int32_t route_id, |
630 int32_t main_frame_route_id, | 630 int32_t main_frame_route_id, |
631 int32_t main_frame_widget_route_id, | 631 int32_t main_frame_widget_route_id, |
632 content::mojom::WindowContainerType window_container_type, | 632 content::mojom::WindowContainerType window_container_type, |
633 const GURL& opener_url, | 633 const GURL& opener_url, |
634 const std::string& frame_name, | 634 const std::string& frame_name, |
635 const GURL& target_url, | 635 const GURL& target_url, |
636 const std::string& partition_id, | 636 const std::string& partition_id, |
637 content::SessionStorageNamespace* session_storage_namespace) override; | 637 content::SessionStorageNamespace* session_storage_namespace) override; |
638 void WebContentsCreated(content::WebContents* source_contents, | 638 void WebContentsCreated( |
639 int opener_render_process_id, | 639 content::WebContents* source_contents, |
640 int opener_render_frame_id, | 640 int opener_render_process_id, |
641 const std::string& frame_name, | 641 int opener_render_frame_id, |
642 const GURL& target_url, | 642 const std::string& frame_name, |
643 content::WebContents* new_contents) override; | 643 const GURL& target_url, |
| 644 content::WebContents* new_contents, |
| 645 const base::Optional<content::WebContents::CreateParams>& create_params) |
| 646 override; |
644 void RendererUnresponsive( | 647 void RendererUnresponsive( |
645 content::WebContents* source, | 648 content::WebContents* source, |
646 const content::WebContentsUnresponsiveState& unresponsive_state) override; | 649 const content::WebContentsUnresponsiveState& unresponsive_state) override; |
647 void RendererResponsive(content::WebContents* source) override; | 650 void RendererResponsive(content::WebContents* source) override; |
648 void DidNavigateMainFramePostCommit( | 651 void DidNavigateMainFramePostCommit( |
649 content::WebContents* web_contents) override; | 652 content::WebContents* web_contents) override; |
650 content::JavaScriptDialogManager* GetJavaScriptDialogManager( | 653 content::JavaScriptDialogManager* GetJavaScriptDialogManager( |
651 content::WebContents* source) override; | 654 content::WebContents* source) override; |
652 content::ColorChooser* OpenColorChooser( | 655 content::ColorChooser* OpenColorChooser( |
653 content::WebContents* web_contents, | 656 content::WebContents* web_contents, |
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1016 // The following factory is used for chrome update coalescing. | 1019 // The following factory is used for chrome update coalescing. |
1017 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1020 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
1018 | 1021 |
1019 // The following factory is used to close the frame at a later time. | 1022 // The following factory is used to close the frame at a later time. |
1020 base::WeakPtrFactory<Browser> weak_factory_; | 1023 base::WeakPtrFactory<Browser> weak_factory_; |
1021 | 1024 |
1022 DISALLOW_COPY_AND_ASSIGN(Browser); | 1025 DISALLOW_COPY_AND_ASSIGN(Browser); |
1023 }; | 1026 }; |
1024 | 1027 |
1025 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1028 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |