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/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1439 return NULL; | 1439 return NULL; |
1440 #endif | 1440 #endif |
1441 | 1441 |
1442 #if defined(ENABLE_WEBRTC) | 1442 #if defined(ENABLE_WEBRTC) |
1443 if (!media_stream_center_) { | 1443 if (!media_stream_center_) { |
1444 media_stream_center_ = GetContentClient()->renderer() | 1444 media_stream_center_ = GetContentClient()->renderer() |
1445 ->OverrideCreateWebMediaStreamCenter(client); | 1445 ->OverrideCreateWebMediaStreamCenter(client); |
1446 if (!media_stream_center_) { | 1446 if (!media_stream_center_) { |
1447 scoped_ptr<MediaStreamCenter> media_stream_center( | 1447 scoped_ptr<MediaStreamCenter> media_stream_center( |
1448 new MediaStreamCenter(client, GetPeerConnectionDependencyFactory())); | 1448 new MediaStreamCenter(client, GetPeerConnectionDependencyFactory())); |
1449 AddObserver(media_stream_center.get()); | |
1450 media_stream_center_ = media_stream_center.release(); | 1449 media_stream_center_ = media_stream_center.release(); |
1451 } | 1450 } |
1452 } | 1451 } |
1453 #endif | 1452 #endif |
1454 return media_stream_center_; | 1453 return media_stream_center_; |
1455 } | 1454 } |
1456 | 1455 |
1457 #if defined(ENABLE_WEBRTC) | 1456 #if defined(ENABLE_WEBRTC) |
1458 PeerConnectionDependencyFactory* | 1457 PeerConnectionDependencyFactory* |
1459 RenderThreadImpl::GetPeerConnectionDependencyFactory() { | 1458 RenderThreadImpl::GetPeerConnectionDependencyFactory() { |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1632 hidden_widget_count_--; | 1631 hidden_widget_count_--; |
1633 | 1632 |
1634 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1633 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1635 return; | 1634 return; |
1636 } | 1635 } |
1637 | 1636 |
1638 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1637 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1639 } | 1638 } |
1640 | 1639 |
1641 } // namespace content | 1640 } // namespace content |
OLD | NEW |