| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/renderer/render_thread.h" | 5 #include "chrome/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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 | 541 |
| 542 UpdateActiveExtensions(); | 542 UpdateActiveExtensions(); |
| 543 } | 543 } |
| 544 | 544 |
| 545 void RenderThread::OnExtensionSetHostPermissions( | 545 void RenderThread::OnExtensionSetHostPermissions( |
| 546 const GURL& extension_url, const std::vector<URLPattern>& permissions) { | 546 const GURL& extension_url, const std::vector<URLPattern>& permissions) { |
| 547 ExtensionProcessBindings::SetHostPermissions(extension_url, permissions); | 547 ExtensionProcessBindings::SetHostPermissions(extension_url, permissions); |
| 548 } | 548 } |
| 549 | 549 |
| 550 void RenderThread::OnExtensionSetIncognitoEnabled( | 550 void RenderThread::OnExtensionSetIncognitoEnabled( |
| 551 const std::string& extension_id, bool enabled) { | 551 const std::string& extension_id, bool enabled, bool incognito_split_mode) { |
| 552 ExtensionProcessBindings::SetIncognitoEnabled(extension_id, enabled); | 552 ExtensionProcessBindings::SetIncognitoEnabled(extension_id, enabled, |
| 553 incognito_split_mode); |
| 553 } | 554 } |
| 554 | 555 |
| 555 void RenderThread::OnDOMStorageEvent( | 556 void RenderThread::OnDOMStorageEvent( |
| 556 const ViewMsg_DOMStorageEvent_Params& params) { | 557 const ViewMsg_DOMStorageEvent_Params& params) { |
| 557 if (!dom_storage_event_dispatcher_.get()) | 558 if (!dom_storage_event_dispatcher_.get()) |
| 558 dom_storage_event_dispatcher_.reset(WebStorageEventDispatcher::create()); | 559 dom_storage_event_dispatcher_.reset(WebStorageEventDispatcher::create()); |
| 559 dom_storage_event_dispatcher_->dispatchStorageEvent(params.key_, | 560 dom_storage_event_dispatcher_->dispatchStorageEvent(params.key_, |
| 560 params.old_value_, params.new_value_, params.origin_, params.url_, | 561 params.old_value_, params.new_value_, params.origin_, params.url_, |
| 561 params.storage_type_ == DOM_STORAGE_LOCAL); | 562 params.storage_type_ == DOM_STORAGE_LOCAL); |
| 562 } | 563 } |
| (...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1079 | 1080 |
| 1080 scoped_refptr<base::MessageLoopProxy> | 1081 scoped_refptr<base::MessageLoopProxy> |
| 1081 RenderThread::GetFileThreadMessageLoopProxy() { | 1082 RenderThread::GetFileThreadMessageLoopProxy() { |
| 1082 DCHECK(message_loop() == MessageLoop::current()); | 1083 DCHECK(message_loop() == MessageLoop::current()); |
| 1083 if (!file_thread_.get()) { | 1084 if (!file_thread_.get()) { |
| 1084 file_thread_.reset(new base::Thread("Renderer::FILE")); | 1085 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 1085 file_thread_->Start(); | 1086 file_thread_->Start(); |
| 1086 } | 1087 } |
| 1087 return file_thread_->message_loop_proxy(); | 1088 return file_thread_->message_loop_proxy(); |
| 1088 } | 1089 } |
| OLD | NEW |