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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 int opener_render_frame_id, | 590 int opener_render_frame_id, |
591 const base::string16& frame_name, | 591 const base::string16& frame_name, |
592 const GURL& target_url, | 592 const GURL& target_url, |
593 content::WebContents* new_contents) override; | 593 content::WebContents* new_contents) override; |
594 void RendererUnresponsive(content::WebContents* source) override; | 594 void RendererUnresponsive(content::WebContents* source) override; |
595 void RendererResponsive(content::WebContents* source) override; | 595 void RendererResponsive(content::WebContents* source) override; |
596 void WorkerCrashed(content::WebContents* source) override; | 596 void WorkerCrashed(content::WebContents* source) override; |
597 void DidNavigateMainFramePostCommit( | 597 void DidNavigateMainFramePostCommit( |
598 content::WebContents* web_contents) override; | 598 content::WebContents* web_contents) override; |
599 void DidNavigateToPendingEntry(content::WebContents* web_contents) override; | 599 void DidNavigateToPendingEntry(content::WebContents* web_contents) override; |
600 content::JavaScriptDialogManager* GetJavaScriptDialogManager() override; | 600 content::JavaScriptDialogManager* GetJavaScriptDialogManager( |
| 601 content::WebContents* source) override; |
601 content::ColorChooser* OpenColorChooser( | 602 content::ColorChooser* OpenColorChooser( |
602 content::WebContents* web_contents, | 603 content::WebContents* web_contents, |
603 SkColor color, | 604 SkColor color, |
604 const std::vector<content::ColorSuggestion>& suggestions) override; | 605 const std::vector<content::ColorSuggestion>& suggestions) override; |
605 void RunFileChooser(content::WebContents* web_contents, | 606 void RunFileChooser(content::WebContents* web_contents, |
606 const content::FileChooserParams& params) override; | 607 const content::FileChooserParams& params) override; |
607 void EnumerateDirectory(content::WebContents* web_contents, | 608 void EnumerateDirectory(content::WebContents* web_contents, |
608 int request_id, | 609 int request_id, |
609 const base::FilePath& path) override; | 610 const base::FilePath& path) override; |
610 bool EmbedsFullscreenWidget() const override; | 611 bool EmbedsFullscreenWidget() const override; |
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
961 | 962 |
962 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 963 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
963 | 964 |
964 // The following factory is used to close the frame at a later time. | 965 // The following factory is used to close the frame at a later time. |
965 base::WeakPtrFactory<Browser> weak_factory_; | 966 base::WeakPtrFactory<Browser> weak_factory_; |
966 | 967 |
967 DISALLOW_COPY_AND_ASSIGN(Browser); | 968 DISALLOW_COPY_AND_ASSIGN(Browser); |
968 }; | 969 }; |
969 | 970 |
970 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 971 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |