| 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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 } | 480 } |
| 481 | 481 |
| 482 if (CommandLine::ForCurrentProcess()->HasSwitch( | 482 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 483 switches::kDomAutomationController)) { | 483 switches::kDomAutomationController)) { |
| 484 base::StringPiece extension = content::GetContentClient()->GetDataResource( | 484 base::StringPiece extension = content::GetContentClient()->GetDataResource( |
| 485 IDR_DOM_AUTOMATION_JS); | 485 IDR_DOM_AUTOMATION_JS); |
| 486 RegisterExtension(new v8::Extension( | 486 RegisterExtension(new v8::Extension( |
| 487 "dom_automation.js", extension.data(), 0, NULL, extension.size())); | 487 "dom_automation.js", extension.data(), 0, NULL, extension.size())); |
| 488 } | 488 } |
| 489 | 489 |
| 490 web_database_observer_impl_.reset(new WebDatabaseObserverImpl(Get())); | 490 web_database_observer_impl_.reset( |
| 491 new WebDatabaseObserverImpl(sync_message_filter())); |
| 491 WebKit::WebDatabase::setObserver(web_database_observer_impl_.get()); | 492 WebKit::WebDatabase::setObserver(web_database_observer_impl_.get()); |
| 492 | 493 |
| 493 WebRuntimeFeatures::enableSockets( | 494 WebRuntimeFeatures::enableSockets( |
| 494 !command_line.HasSwitch(switches::kDisableWebSockets)); | 495 !command_line.HasSwitch(switches::kDisableWebSockets)); |
| 495 | 496 |
| 496 WebRuntimeFeatures::enableDatabase( | 497 WebRuntimeFeatures::enableDatabase( |
| 497 !command_line.HasSwitch(switches::kDisableDatabases)); | 498 !command_line.HasSwitch(switches::kDisableDatabases)); |
| 498 | 499 |
| 499 WebRuntimeFeatures::enableDataTransferItems( | 500 WebRuntimeFeatures::enableDataTransferItems( |
| 500 !command_line.HasSwitch(switches::kDisableDataTransferItems)); | 501 !command_line.HasSwitch(switches::kDisableDataTransferItems)); |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 941 | 942 |
| 942 scoped_refptr<base::MessageLoopProxy> | 943 scoped_refptr<base::MessageLoopProxy> |
| 943 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 944 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
| 944 DCHECK(message_loop() == MessageLoop::current()); | 945 DCHECK(message_loop() == MessageLoop::current()); |
| 945 if (!file_thread_.get()) { | 946 if (!file_thread_.get()) { |
| 946 file_thread_.reset(new base::Thread("Renderer::FILE")); | 947 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 947 file_thread_->Start(); | 948 file_thread_->Start(); |
| 948 } | 949 } |
| 949 return file_thread_->message_loop_proxy(); | 950 return file_thread_->message_loop_proxy(); |
| 950 } | 951 } |
| OLD | NEW |