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 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 content::WebContents* web_contents, | 614 content::WebContents* web_contents, |
615 int32_t route_id, | 615 int32_t route_id, |
616 int32_t main_frame_route_id, | 616 int32_t main_frame_route_id, |
617 int32_t main_frame_widget_route_id, | 617 int32_t main_frame_widget_route_id, |
618 WindowContainerType window_container_type, | 618 WindowContainerType window_container_type, |
619 const std::string& frame_name, | 619 const std::string& frame_name, |
620 const GURL& target_url, | 620 const GURL& target_url, |
621 const std::string& partition_id, | 621 const std::string& partition_id, |
622 content::SessionStorageNamespace* session_storage_namespace) override; | 622 content::SessionStorageNamespace* session_storage_namespace) override; |
623 void WebContentsCreated(content::WebContents* source_contents, | 623 void WebContentsCreated(content::WebContents* source_contents, |
| 624 int opener_render_process_id, |
624 int opener_render_frame_id, | 625 int opener_render_frame_id, |
625 const std::string& frame_name, | 626 const std::string& frame_name, |
626 const GURL& target_url, | 627 const GURL& target_url, |
627 content::WebContents* new_contents) override; | 628 content::WebContents* new_contents) override; |
628 void RendererUnresponsive(content::WebContents* source) override; | 629 void RendererUnresponsive(content::WebContents* source) override; |
629 void RendererResponsive(content::WebContents* source) override; | 630 void RendererResponsive(content::WebContents* source) override; |
630 void DidNavigateMainFramePostCommit( | 631 void DidNavigateMainFramePostCommit( |
631 content::WebContents* web_contents) override; | 632 content::WebContents* web_contents) override; |
632 content::JavaScriptDialogManager* GetJavaScriptDialogManager( | 633 content::JavaScriptDialogManager* GetJavaScriptDialogManager( |
633 content::WebContents* source) override; | 634 content::WebContents* source) override; |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1008 // The following factory is used for chrome update coalescing. | 1009 // The following factory is used for chrome update coalescing. |
1009 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1010 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
1010 | 1011 |
1011 // The following factory is used to close the frame at a later time. | 1012 // The following factory is used to close the frame at a later time. |
1012 base::WeakPtrFactory<Browser> weak_factory_; | 1013 base::WeakPtrFactory<Browser> weak_factory_; |
1013 | 1014 |
1014 DISALLOW_COPY_AND_ASSIGN(Browser); | 1015 DISALLOW_COPY_AND_ASSIGN(Browser); |
1015 }; | 1016 }; |
1016 | 1017 |
1017 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1018 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |