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 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
664 int active_match_ordinal, | 664 int active_match_ordinal, |
665 bool final_update) OVERRIDE; | 665 bool final_update) OVERRIDE; |
666 virtual void RequestToLockMouse(content::WebContents* web_contents, | 666 virtual void RequestToLockMouse(content::WebContents* web_contents, |
667 bool user_gesture, | 667 bool user_gesture, |
668 bool last_unlocked_by_target) OVERRIDE; | 668 bool last_unlocked_by_target) OVERRIDE; |
669 virtual void LostMouseLock() OVERRIDE; | 669 virtual void LostMouseLock() OVERRIDE; |
670 virtual void RequestMediaAccessPermission( | 670 virtual void RequestMediaAccessPermission( |
671 content::WebContents* web_contents, | 671 content::WebContents* web_contents, |
672 const content::MediaStreamRequest* request, | 672 const content::MediaStreamRequest* request, |
673 const content::MediaResponseCallback& callback) OVERRIDE; | 673 const content::MediaResponseCallback& callback) OVERRIDE; |
| 674 virtual bool RequestPpapiBrokerPermission( |
| 675 content::WebContents* web_contents, |
| 676 const GURL& url, |
| 677 const FilePath& plugin_path, |
| 678 const base::Callback<void(bool)>& callback) OVERRIDE; |
674 | 679 |
675 // Overridden from CoreTabHelperDelegate: | 680 // Overridden from CoreTabHelperDelegate: |
676 // Note that the caller is responsible for deleting |old_tab_contents|. | 681 // Note that the caller is responsible for deleting |old_tab_contents|. |
677 virtual void SwapTabContents(content::WebContents* old_contents, | 682 virtual void SwapTabContents(content::WebContents* old_contents, |
678 content::WebContents* new_contents) OVERRIDE; | 683 content::WebContents* new_contents) OVERRIDE; |
679 virtual bool CanReloadContents( | 684 virtual bool CanReloadContents( |
680 content::WebContents* web_contents) const OVERRIDE; | 685 content::WebContents* web_contents) const OVERRIDE; |
681 virtual bool CanSaveContents( | 686 virtual bool CanSaveContents( |
682 content::WebContents* web_contents) const OVERRIDE; | 687 content::WebContents* web_contents) const OVERRIDE; |
683 | 688 |
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
965 bool window_has_shown_; | 970 bool window_has_shown_; |
966 | 971 |
967 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 972 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
968 // before DidEndColorChooser is called. | 973 // before DidEndColorChooser is called. |
969 scoped_ptr<content::ColorChooser> color_chooser_; | 974 scoped_ptr<content::ColorChooser> color_chooser_; |
970 | 975 |
971 DISALLOW_COPY_AND_ASSIGN(Browser); | 976 DISALLOW_COPY_AND_ASSIGN(Browser); |
972 }; | 977 }; |
973 | 978 |
974 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 979 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |