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 <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
680 bool user_gesture, | 680 bool user_gesture, |
681 bool last_unlocked_by_target) override; | 681 bool last_unlocked_by_target) override; |
682 void LostMouseLock() override; | 682 void LostMouseLock() override; |
683 void RequestMediaAccessPermission( | 683 void RequestMediaAccessPermission( |
684 content::WebContents* web_contents, | 684 content::WebContents* web_contents, |
685 const content::MediaStreamRequest& request, | 685 const content::MediaStreamRequest& request, |
686 const content::MediaResponseCallback& callback) override; | 686 const content::MediaResponseCallback& callback) override; |
687 bool CheckMediaAccessPermission(content::WebContents* web_contents, | 687 bool CheckMediaAccessPermission(content::WebContents* web_contents, |
688 const GURL& security_origin, | 688 const GURL& security_origin, |
689 content::MediaStreamType type) override; | 689 content::MediaStreamType type) override; |
| 690 std::string GetDefaultMediaDeviceID(content::WebContents* web_contents, |
| 691 content::MediaStreamType type) override; |
690 bool RequestPpapiBrokerPermission( | 692 bool RequestPpapiBrokerPermission( |
691 content::WebContents* web_contents, | 693 content::WebContents* web_contents, |
692 const GURL& url, | 694 const GURL& url, |
693 const base::FilePath& plugin_path, | 695 const base::FilePath& plugin_path, |
694 const base::Callback<void(bool)>& callback) override; | 696 const base::Callback<void(bool)>& callback) override; |
695 gfx::Size GetSizeForNewRenderView( | 697 gfx::Size GetSizeForNewRenderView( |
696 content::WebContents* web_contents) const override; | 698 content::WebContents* web_contents) const override; |
697 | 699 |
698 // Overridden from CoreTabHelperDelegate: | 700 // Overridden from CoreTabHelperDelegate: |
699 // Note that the caller is responsible for deleting |old_contents|. | 701 // Note that the caller is responsible for deleting |old_contents|. |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1015 // The following factory is used for chrome update coalescing. | 1017 // The following factory is used for chrome update coalescing. |
1016 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1018 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
1017 | 1019 |
1018 // The following factory is used to close the frame at a later time. | 1020 // The following factory is used to close the frame at a later time. |
1019 base::WeakPtrFactory<Browser> weak_factory_; | 1021 base::WeakPtrFactory<Browser> weak_factory_; |
1020 | 1022 |
1021 DISALLOW_COPY_AND_ASSIGN(Browser); | 1023 DISALLOW_COPY_AND_ASSIGN(Browser); |
1022 }; | 1024 }; |
1023 | 1025 |
1024 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1026 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |