| 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 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 640 int active_match_ordinal, | 640 int active_match_ordinal, |
| 641 bool final_update) OVERRIDE; | 641 bool final_update) OVERRIDE; |
| 642 virtual void RequestToLockMouse(content::WebContents* web_contents, | 642 virtual void RequestToLockMouse(content::WebContents* web_contents, |
| 643 bool user_gesture, | 643 bool user_gesture, |
| 644 bool last_unlocked_by_target) OVERRIDE; | 644 bool last_unlocked_by_target) OVERRIDE; |
| 645 virtual void LostMouseLock() OVERRIDE; | 645 virtual void LostMouseLock() OVERRIDE; |
| 646 virtual void RequestMediaAccessPermission( | 646 virtual void RequestMediaAccessPermission( |
| 647 content::WebContents* web_contents, | 647 content::WebContents* web_contents, |
| 648 const content::MediaStreamRequest& request, | 648 const content::MediaStreamRequest& request, |
| 649 const content::MediaResponseCallback& callback) OVERRIDE; | 649 const content::MediaResponseCallback& callback) OVERRIDE; |
| 650 virtual void AllowMicAccessBasedOnPolicyAndAppPermissions( |
| 651 WebContents* web_contents, |
| 652 const GURL& security_origin, |
| 653 const MediaAccessResponseCallback& callback) OVERRIDE; |
| 650 virtual bool RequestPpapiBrokerPermission( | 654 virtual bool RequestPpapiBrokerPermission( |
| 651 content::WebContents* web_contents, | 655 content::WebContents* web_contents, |
| 652 const GURL& url, | 656 const GURL& url, |
| 653 const base::FilePath& plugin_path, | 657 const base::FilePath& plugin_path, |
| 654 const base::Callback<void(bool)>& callback) OVERRIDE; | 658 const base::Callback<void(bool)>& callback) OVERRIDE; |
| 655 virtual gfx::Size GetSizeForNewRenderView( | 659 virtual gfx::Size GetSizeForNewRenderView( |
| 656 content::WebContents* web_contents) const OVERRIDE; | 660 content::WebContents* web_contents) const OVERRIDE; |
| 657 | 661 |
| 658 // Overridden from CoreTabHelperDelegate: | 662 // Overridden from CoreTabHelperDelegate: |
| 659 // Note that the caller is responsible for deleting |old_contents|. | 663 // Note that the caller is responsible for deleting |old_contents|. |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 954 base::WeakPtrFactory<Browser> weak_factory_; | 958 base::WeakPtrFactory<Browser> weak_factory_; |
| 955 | 959 |
| 956 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; | 960 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; |
| 957 | 961 |
| 958 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 962 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
| 959 | 963 |
| 960 DISALLOW_COPY_AND_ASSIGN(Browser); | 964 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 961 }; | 965 }; |
| 962 | 966 |
| 963 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 967 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |