Chromium Code Reviews| 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/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 2475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2486 } | 2486 } |
| 2487 Send(new ViewMsg_StopFinding(GetRoutingID(), action)); | 2487 Send(new ViewMsg_StopFinding(GetRoutingID(), action)); |
| 2488 } | 2488 } |
| 2489 | 2489 |
| 2490 void WebContentsImpl::InsertCSS(const std::string& css) { | 2490 void WebContentsImpl::InsertCSS(const std::string& css) { |
| 2491 GetMainFrame()->Send(new FrameMsg_CSSInsertRequest( | 2491 GetMainFrame()->Send(new FrameMsg_CSSInsertRequest( |
| 2492 GetMainFrame()->GetRoutingID(), css)); | 2492 GetMainFrame()->GetRoutingID(), css)); |
| 2493 } | 2493 } |
| 2494 | 2494 |
| 2495 bool WebContentsImpl::WasRecentlyAudible() { | 2495 bool WebContentsImpl::WasRecentlyAudible() { |
| 2496 #if defined(ENABLE_BROWSER_CDMS) && defined(OS_ANDROID) | |
|
no sievers
2015/02/10 01:33:03
Why is there an #ifdef here?
Can you put a comment
Tima Vaisburd
2015/02/11 03:34:05
Added a comment, please take a look.
| |
| 2497 return media_web_contents_observer_->IsAudible(); | |
| 2498 #else | |
| 2496 return audio_stream_monitor_.WasRecentlyAudible(); | 2499 return audio_stream_monitor_.WasRecentlyAudible(); |
| 2500 #endif | |
| 2497 } | 2501 } |
| 2498 | 2502 |
| 2499 void WebContentsImpl::GetManifest(const GetManifestCallback& callback) { | 2503 void WebContentsImpl::GetManifest(const GetManifestCallback& callback) { |
| 2500 manifest_manager_host_->GetManifest(GetMainFrame(), callback); | 2504 manifest_manager_host_->GetManifest(GetMainFrame(), callback); |
| 2501 } | 2505 } |
| 2502 | 2506 |
| 2503 void WebContentsImpl::ExitFullscreen() { | 2507 void WebContentsImpl::ExitFullscreen() { |
| 2504 // Clean up related state and initiate the fullscreen exit. | 2508 // Clean up related state and initiate the fullscreen exit. |
| 2505 GetRenderViewHostImpl()->RejectMouseLockOrUnlockIfNecessary(); | 2509 GetRenderViewHostImpl()->RejectMouseLockOrUnlockIfNecessary(); |
| 2506 ExitFullscreenMode(); | 2510 ExitFullscreenMode(); |
| (...skipping 1969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4476 node->render_manager()->ResumeResponseDeferredAtStart(); | 4480 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4477 } | 4481 } |
| 4478 | 4482 |
| 4479 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4483 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
| 4480 force_disable_overscroll_content_ = force_disable; | 4484 force_disable_overscroll_content_ = force_disable; |
| 4481 if (view_) | 4485 if (view_) |
| 4482 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4486 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
| 4483 } | 4487 } |
| 4484 | 4488 |
| 4485 } // namespace content | 4489 } // namespace content |
| OLD | NEW |