| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" | 5 #include "content/renderer/render_thread.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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 | 590 |
| 591 WebRuntimeFeatures::enableIndexedDatabase( | 591 WebRuntimeFeatures::enableIndexedDatabase( |
| 592 !command_line.HasSwitch(switches::kDisableIndexedDatabase)); | 592 !command_line.HasSwitch(switches::kDisableIndexedDatabase)); |
| 593 | 593 |
| 594 WebRuntimeFeatures::enableGeolocation( | 594 WebRuntimeFeatures::enableGeolocation( |
| 595 !command_line.HasSwitch(switches::kDisableGeolocation)); | 595 !command_line.HasSwitch(switches::kDisableGeolocation)); |
| 596 | 596 |
| 597 WebKit::WebRuntimeFeatures::enableMediaStream( | 597 WebKit::WebRuntimeFeatures::enableMediaStream( |
| 598 command_line.HasSwitch(switches::kEnableMediaStream)); | 598 command_line.HasSwitch(switches::kEnableMediaStream)); |
| 599 | 599 |
| 600 #if defined(OS_CHROMEOS) |
| 601 // TODO(crogers): enable once Web Audio has been tested and optimized. |
| 602 WebRuntimeFeatures::enableWebAudio(false); |
| 603 #else |
| 600 WebRuntimeFeatures::enableWebAudio( | 604 WebRuntimeFeatures::enableWebAudio( |
| 601 command_line.HasSwitch(switches::kEnableWebAudio)); | 605 !command_line.HasSwitch(switches::kDisableWebAudio)); |
| 606 #endif |
| 602 | 607 |
| 603 WebRuntimeFeatures::enablePushState(true); | 608 WebRuntimeFeatures::enablePushState(true); |
| 604 | 609 |
| 605 #ifdef TOUCH_UI | 610 #ifdef TOUCH_UI |
| 606 WebRuntimeFeatures::enableTouch(true); | 611 WebRuntimeFeatures::enableTouch(true); |
| 607 #else | 612 #else |
| 608 // TODO(saintlou): in the future touch should always be enabled | 613 // TODO(saintlou): in the future touch should always be enabled |
| 609 WebRuntimeFeatures::enableTouch(false); | 614 WebRuntimeFeatures::enableTouch(false); |
| 610 #endif | 615 #endif |
| 611 | 616 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 680 | 685 |
| 681 void RenderThread::RegisterExtension(v8::Extension* extension) { | 686 void RenderThread::RegisterExtension(v8::Extension* extension) { |
| 682 WebScriptController::registerExtension(extension); | 687 WebScriptController::registerExtension(extension); |
| 683 v8_extensions_.insert(extension->name()); | 688 v8_extensions_.insert(extension->name()); |
| 684 } | 689 } |
| 685 | 690 |
| 686 bool RenderThread::IsRegisteredExtension( | 691 bool RenderThread::IsRegisteredExtension( |
| 687 const std::string& v8_extension_name) const { | 692 const std::string& v8_extension_name) const { |
| 688 return v8_extensions_.find(v8_extension_name) != v8_extensions_.end(); | 693 return v8_extensions_.find(v8_extension_name) != v8_extensions_.end(); |
| 689 } | 694 } |
| OLD | NEW |