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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 int active_match_ordinal, | 637 int active_match_ordinal, |
638 bool final_update) OVERRIDE; | 638 bool final_update) OVERRIDE; |
639 virtual void RequestToLockMouse(content::WebContents* web_contents, | 639 virtual void RequestToLockMouse(content::WebContents* web_contents, |
640 bool user_gesture, | 640 bool user_gesture, |
641 bool last_unlocked_by_target) OVERRIDE; | 641 bool last_unlocked_by_target) OVERRIDE; |
642 virtual void LostMouseLock() OVERRIDE; | 642 virtual void LostMouseLock() OVERRIDE; |
643 virtual void RequestMediaAccessPermission( | 643 virtual void RequestMediaAccessPermission( |
644 content::WebContents* web_contents, | 644 content::WebContents* web_contents, |
645 const content::MediaStreamRequest* request, | 645 const content::MediaStreamRequest* request, |
646 const content::MediaResponseCallback& callback) OVERRIDE; | 646 const content::MediaResponseCallback& callback) OVERRIDE; |
| 647 virtual void RequestPpapiBrokerPermission( |
| 648 content::WebContents* web_contents, |
| 649 const GURL& url, |
| 650 const FilePath& plugin_path, |
| 651 const base::Callback<void(bool)>& callback) OVERRIDE; |
647 | 652 |
648 // Overridden from CoreTabHelperDelegate: | 653 // Overridden from CoreTabHelperDelegate: |
649 // Note that the caller is responsible for deleting |old_tab_contents|. | 654 // Note that the caller is responsible for deleting |old_tab_contents|. |
650 virtual void SwapTabContents(TabContents* old_tab_contents, | 655 virtual void SwapTabContents(TabContents* old_tab_contents, |
651 TabContents* new_tab_contents) OVERRIDE; | 656 TabContents* new_tab_contents) OVERRIDE; |
652 virtual bool CanReloadContents(TabContents* source) const OVERRIDE; | 657 virtual bool CanReloadContents(TabContents* source) const OVERRIDE; |
653 virtual bool CanSaveContents(TabContents* source) const OVERRIDE; | 658 virtual bool CanSaveContents(TabContents* source) const OVERRIDE; |
654 | 659 |
655 // Overridden from SearchEngineTabHelperDelegate: | 660 // Overridden from SearchEngineTabHelperDelegate: |
656 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 661 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
923 bool window_has_shown_; | 928 bool window_has_shown_; |
924 | 929 |
925 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 930 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
926 // before DidEndColorChooser is called. | 931 // before DidEndColorChooser is called. |
927 scoped_ptr<content::ColorChooser> color_chooser_; | 932 scoped_ptr<content::ColorChooser> color_chooser_; |
928 | 933 |
929 DISALLOW_COPY_AND_ASSIGN(Browser); | 934 DISALLOW_COPY_AND_ASSIGN(Browser); |
930 }; | 935 }; |
931 | 936 |
932 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 937 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |