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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 #if defined(OS_ANDROID) | 662 #if defined(OS_ANDROID) |
663 WebRuntimeFeatures::enableWebAudio( | 663 WebRuntimeFeatures::enableWebAudio( |
664 command_line.HasSwitch(switches::kEnableWebAudio) && | 664 command_line.HasSwitch(switches::kEnableWebAudio) && |
665 media::IsMediaLibraryInitialized()); | 665 media::IsMediaLibraryInitialized()); |
666 #else | 666 #else |
667 WebRuntimeFeatures::enableWebAudio( | 667 WebRuntimeFeatures::enableWebAudio( |
668 !command_line.HasSwitch(switches::kDisableWebAudio) && | 668 !command_line.HasSwitch(switches::kDisableWebAudio) && |
669 media::IsMediaLibraryInitialized()); | 669 media::IsMediaLibraryInitialized()); |
670 #endif | 670 #endif |
671 | 671 |
672 WebRuntimeFeatures::enablePushState(true); | |
673 | |
674 WebRuntimeFeatures::enableTouch( | 672 WebRuntimeFeatures::enableTouch( |
675 command_line.HasSwitch(switches::kEnableTouchEvents)); | 673 command_line.HasSwitch(switches::kEnableTouchEvents)); |
676 | 674 |
677 WebRuntimeFeatures::enableDeviceMotion( | 675 WebRuntimeFeatures::enableDeviceMotion( |
678 command_line.HasSwitch(switches::kEnableDeviceMotion)); | 676 command_line.HasSwitch(switches::kEnableDeviceMotion)); |
679 | 677 |
680 WebRuntimeFeatures::enableDeviceOrientation( | 678 WebRuntimeFeatures::enableDeviceOrientation( |
681 !command_line.HasSwitch(switches::kDisableDeviceOrientation)); | 679 !command_line.HasSwitch(switches::kDisableDeviceOrientation)); |
682 | 680 |
683 WebRuntimeFeatures::enableSpeechInput( | 681 WebRuntimeFeatures::enableSpeechInput( |
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1129 | 1127 |
1130 scoped_refptr<base::MessageLoopProxy> | 1128 scoped_refptr<base::MessageLoopProxy> |
1131 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 1129 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
1132 DCHECK(message_loop() == MessageLoop::current()); | 1130 DCHECK(message_loop() == MessageLoop::current()); |
1133 if (!file_thread_.get()) { | 1131 if (!file_thread_.get()) { |
1134 file_thread_.reset(new base::Thread("Renderer::FILE")); | 1132 file_thread_.reset(new base::Thread("Renderer::FILE")); |
1135 file_thread_->Start(); | 1133 file_thread_->Start(); |
1136 } | 1134 } |
1137 return file_thread_->message_loop_proxy(); | 1135 return file_thread_->message_loop_proxy(); |
1138 } | 1136 } |
OLD | NEW |