Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/renderer/dispatcher.h" | 5 #include "extensions/renderer/dispatcher.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/debug/alias.h" | 9 #include "base/debug/alias.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 545 | 545 |
| 546 active_extension_ids_.insert(extension_id); | 546 active_extension_ids_.insert(extension_id); |
| 547 | 547 |
| 548 // This is called when starting a new extension page, so start the idle | 548 // This is called when starting a new extension page, so start the idle |
| 549 // handler ticking. | 549 // handler ticking. |
| 550 RenderThread::Get()->ScheduleIdleHandler(kInitialExtensionIdleHandlerDelayMs); | 550 RenderThread::Get()->ScheduleIdleHandler(kInitialExtensionIdleHandlerDelayMs); |
| 551 | 551 |
| 552 if (is_webkit_initialized_) { | 552 if (is_webkit_initialized_) { |
| 553 extensions::DOMActivityLogger::AttachToWorld( | 553 extensions::DOMActivityLogger::AttachToWorld( |
| 554 extensions::DOMActivityLogger::kMainWorldId, extension_id); | 554 extensions::DOMActivityLogger::kMainWorldId, extension_id); |
| 555 | |
| 556 if (extension) | |
| 557 InitOriginPermissions(extension, Feature::UNSPECIFIED_CONTEXT); | |
|
not at google - send to devlin
2014/06/05 16:48:23
this is an odd change to make without
- taking out
| |
| 555 } | 558 } |
| 556 | 559 |
| 557 UpdateActiveExtensions(); | 560 UpdateActiveExtensions(); |
| 558 } | 561 } |
| 559 | 562 |
| 560 void Dispatcher::OnCancelSuspend(const std::string& extension_id) { | 563 void Dispatcher::OnCancelSuspend(const std::string& extension_id) { |
| 561 DispatchEvent(extension_id, kOnSuspendCanceledEvent); | 564 DispatchEvent(extension_id, kOnSuspendCanceledEvent); |
| 562 } | 565 } |
| 563 | 566 |
| 564 void Dispatcher::OnClearTabSpecificPermissions( | 567 void Dispatcher::OnClearTabSpecificPermissions( |
| (...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1233 return v8::Handle<v8::Object>(); | 1236 return v8::Handle<v8::Object>(); |
| 1234 | 1237 |
| 1235 if (bind_name) | 1238 if (bind_name) |
| 1236 *bind_name = split.back(); | 1239 *bind_name = split.back(); |
| 1237 | 1240 |
| 1238 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context)) | 1241 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context)) |
| 1239 : bind_object; | 1242 : bind_object; |
| 1240 } | 1243 } |
| 1241 | 1244 |
| 1242 } // namespace extensions | 1245 } // namespace extensions |
| OLD | NEW |