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 1686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1697 | 1697 |
1698 void WebContentsImpl::RequestMediaAccessPermission( | 1698 void WebContentsImpl::RequestMediaAccessPermission( |
1699 const MediaStreamRequest& request, | 1699 const MediaStreamRequest& request, |
1700 const MediaResponseCallback& callback) { | 1700 const MediaResponseCallback& callback) { |
1701 if (delegate_) | 1701 if (delegate_) |
1702 delegate_->RequestMediaAccessPermission(this, request, callback); | 1702 delegate_->RequestMediaAccessPermission(this, request, callback); |
1703 else | 1703 else |
1704 callback.Run(MediaStreamDevices(), scoped_ptr<MediaStreamUI>()); | 1704 callback.Run(MediaStreamDevices(), scoped_ptr<MediaStreamUI>()); |
1705 } | 1705 } |
1706 | 1706 |
| 1707 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace( |
| 1708 SiteInstance* instance) { |
| 1709 return controller_.GetSessionStorageNamespace(instance); |
| 1710 } |
| 1711 |
1707 void WebContentsImpl::DidSendScreenRects(RenderWidgetHostImpl* rwh) { | 1712 void WebContentsImpl::DidSendScreenRects(RenderWidgetHostImpl* rwh) { |
1708 if (browser_plugin_embedder_) | 1713 if (browser_plugin_embedder_) |
1709 browser_plugin_embedder_->DidSendScreenRects(); | 1714 browser_plugin_embedder_->DidSendScreenRects(); |
1710 } | 1715 } |
1711 | 1716 |
1712 void WebContentsImpl::UpdatePreferredSize(const gfx::Size& pref_size) { | 1717 void WebContentsImpl::UpdatePreferredSize(const gfx::Size& pref_size) { |
1713 preferred_size_ = pref_size; | 1718 preferred_size_ = pref_size; |
1714 if (delegate_) | 1719 if (delegate_) |
1715 delegate_->UpdatePreferredSize(this, pref_size); | 1720 delegate_->UpdatePreferredSize(this, pref_size); |
1716 } | 1721 } |
(...skipping 2004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3721 } | 3726 } |
3722 | 3727 |
3723 void WebContentsImpl::ClearAllPowerSaveBlockers() { | 3728 void WebContentsImpl::ClearAllPowerSaveBlockers() { |
3724 for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin()); | 3729 for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin()); |
3725 i != power_save_blockers_.end(); ++i) | 3730 i != power_save_blockers_.end(); ++i) |
3726 STLDeleteValues(&power_save_blockers_[i->first]); | 3731 STLDeleteValues(&power_save_blockers_[i->first]); |
3727 power_save_blockers_.clear(); | 3732 power_save_blockers_.clear(); |
3728 } | 3733 } |
3729 | 3734 |
3730 } // namespace content | 3735 } // namespace content |
OLD | NEW |