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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 content::WebContents* source, | 557 content::WebContents* source, |
558 const GURL& frame_url, | 558 const GURL& frame_url, |
559 const std::string& frame_content_state) OVERRIDE; | 559 const std::string& frame_content_state) OVERRIDE; |
560 virtual void ShowRepostFormWarningDialog( | 560 virtual void ShowRepostFormWarningDialog( |
561 content::WebContents* source) OVERRIDE; | 561 content::WebContents* source) OVERRIDE; |
562 virtual bool ShouldCreateWebContents( | 562 virtual bool ShouldCreateWebContents( |
563 content::WebContents* web_contents, | 563 content::WebContents* web_contents, |
564 int route_id, | 564 int route_id, |
565 WindowContainerType window_container_type, | 565 WindowContainerType window_container_type, |
566 const string16& frame_name, | 566 const string16& frame_name, |
567 const GURL& target_url) OVERRIDE; | 567 const GURL& target_url, |
| 568 const WebKit::WebWindowFeatures& web_window_features) OVERRIDE; |
568 virtual void WebContentsCreated(content::WebContents* source_contents, | 569 virtual void WebContentsCreated(content::WebContents* source_contents, |
569 int64 source_frame_id, | 570 int64 source_frame_id, |
570 const string16& frame_name, | 571 const string16& frame_name, |
571 const GURL& target_url, | 572 const GURL& target_url, |
572 content::WebContents* new_contents) OVERRIDE; | 573 content::WebContents* new_contents) OVERRIDE; |
573 virtual void ContentRestrictionsChanged( | 574 virtual void ContentRestrictionsChanged( |
574 content::WebContents* source) OVERRIDE; | 575 content::WebContents* source) OVERRIDE; |
575 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 576 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; |
576 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 577 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; |
577 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; | 578 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
917 bool window_has_shown_; | 918 bool window_has_shown_; |
918 | 919 |
919 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 920 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
920 // before DidEndColorChooser is called. | 921 // before DidEndColorChooser is called. |
921 scoped_ptr<content::ColorChooser> color_chooser_; | 922 scoped_ptr<content::ColorChooser> color_chooser_; |
922 | 923 |
923 DISALLOW_COPY_AND_ASSIGN(Browser); | 924 DISALLOW_COPY_AND_ASSIGN(Browser); |
924 }; | 925 }; |
925 | 926 |
926 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 927 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |