| 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 #include "content/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 1733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1744 const MediaResponseCallback& callback) { | 1744 const MediaResponseCallback& callback) { |
| 1745 if (delegate_) { | 1745 if (delegate_) { |
| 1746 delegate_->RequestMediaAccessPermission(this, request, callback); | 1746 delegate_->RequestMediaAccessPermission(this, request, callback); |
| 1747 } else { | 1747 } else { |
| 1748 callback.Run(MediaStreamDevices(), | 1748 callback.Run(MediaStreamDevices(), |
| 1749 MEDIA_DEVICE_INVALID_STATE, | 1749 MEDIA_DEVICE_INVALID_STATE, |
| 1750 scoped_ptr<MediaStreamUI>()); | 1750 scoped_ptr<MediaStreamUI>()); |
| 1751 } | 1751 } |
| 1752 } | 1752 } |
| 1753 | 1753 |
| 1754 void WebContentsImpl::AllowMicAccessBasedOnPolicyAndAppPermissions( |
| 1755 const GURL& security_origin, |
| 1756 const MediaAccessResponseCallback& callback) { |
| 1757 if (delegate_) { |
| 1758 delegate_->AllowMicAccessBasedOnPolicyAndAppPermissions(this, |
| 1759 security_origin, |
| 1760 callback); |
| 1761 } else { |
| 1762 callback.Run(false); |
| 1763 } |
| 1764 } |
| 1765 |
| 1754 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace( | 1766 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace( |
| 1755 SiteInstance* instance) { | 1767 SiteInstance* instance) { |
| 1756 return controller_.GetSessionStorageNamespace(instance); | 1768 return controller_.GetSessionStorageNamespace(instance); |
| 1757 } | 1769 } |
| 1758 | 1770 |
| 1759 SessionStorageNamespaceMap WebContentsImpl::GetSessionStorageNamespaceMap() { | 1771 SessionStorageNamespaceMap WebContentsImpl::GetSessionStorageNamespaceMap() { |
| 1760 return controller_.GetSessionStorageNamespaceMap(); | 1772 return controller_.GetSessionStorageNamespaceMap(); |
| 1761 } | 1773 } |
| 1762 | 1774 |
| 1763 FrameTree* WebContentsImpl::GetFrameTree() { | 1775 FrameTree* WebContentsImpl::GetFrameTree() { |
| (...skipping 2476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4240 node->render_manager()->ResumeResponseDeferredAtStart(); | 4252 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4241 } | 4253 } |
| 4242 | 4254 |
| 4243 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4255 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
| 4244 force_disable_overscroll_content_ = force_disable; | 4256 force_disable_overscroll_content_ = force_disable; |
| 4245 if (view_) | 4257 if (view_) |
| 4246 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4258 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
| 4247 } | 4259 } |
| 4248 | 4260 |
| 4249 } // namespace content | 4261 } // namespace content |
| OLD | NEW |