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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 WindowContainerType window_container_type, | 566 WindowContainerType window_container_type, |
567 const string16& frame_name, | 567 const string16& frame_name, |
568 const GURL& target_url, | 568 const GURL& target_url, |
569 WindowOpenDisposition disposition, | 569 WindowOpenDisposition disposition, |
570 bool user_action) OVERRIDE; | 570 bool user_action) OVERRIDE; |
571 virtual void WebContentsCreated(content::WebContents* source_contents, | 571 virtual void WebContentsCreated(content::WebContents* source_contents, |
572 int64 source_frame_id, | 572 int64 source_frame_id, |
573 const string16& frame_name, | 573 const string16& frame_name, |
574 const GURL& target_url, | 574 const GURL& target_url, |
575 content::WebContents* new_contents) OVERRIDE; | 575 content::WebContents* new_contents) OVERRIDE; |
576 virtual void ContentRestrictionsChanged( | |
577 content::WebContents* source) OVERRIDE; | |
578 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 576 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; |
579 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 577 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; |
580 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; | 578 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; |
581 virtual void DidNavigateMainFramePostCommit( | 579 virtual void DidNavigateMainFramePostCommit( |
582 content::WebContents* web_contents) OVERRIDE; | 580 content::WebContents* web_contents) OVERRIDE; |
583 virtual void DidNavigateToPendingEntry( | 581 virtual void DidNavigateToPendingEntry( |
584 content::WebContents* web_contents) OVERRIDE; | 582 content::WebContents* web_contents) OVERRIDE; |
585 virtual content::JavaScriptDialogManager* | 583 virtual content::JavaScriptDialogManager* |
586 GetJavaScriptDialogManager() OVERRIDE; | 584 GetJavaScriptDialogManager() OVERRIDE; |
587 virtual content::ColorChooser* OpenColorChooser( | 585 virtual content::ColorChooser* OpenColorChooser( |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
907 | 905 |
908 scoped_ptr<chrome::BrowserCommandController> command_controller_; | 906 scoped_ptr<chrome::BrowserCommandController> command_controller_; |
909 | 907 |
910 // True if the browser window has been shown at least once. | 908 // True if the browser window has been shown at least once. |
911 bool window_has_shown_; | 909 bool window_has_shown_; |
912 | 910 |
913 DISALLOW_COPY_AND_ASSIGN(Browser); | 911 DISALLOW_COPY_AND_ASSIGN(Browser); |
914 }; | 912 }; |
915 | 913 |
916 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 914 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |