| 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/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/alias.h" | 10 #include "base/debug/alias.h" |
| (...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 resources.push_back( | 567 resources.push_back( |
| 568 std::make_pair(mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS)); | 568 std::make_pair(mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS)); |
| 569 resources.push_back( | 569 resources.push_back( |
| 570 std::make_pair(mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS)); | 570 std::make_pair(mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS)); |
| 571 resources.push_back( | 571 resources.push_back( |
| 572 std::make_pair(mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS)); | 572 std::make_pair(mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS)); |
| 573 resources.push_back( | 573 resources.push_back( |
| 574 std::make_pair(mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS)); | 574 std::make_pair(mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS)); |
| 575 resources.push_back( | 575 resources.push_back( |
| 576 std::make_pair(mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS)); | 576 std::make_pair(mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS)); |
| 577 resources.push_back(std::make_pair("keep_alive", IDR_KEEP_ALIVE_JS)); |
| 578 resources.push_back(std::make_pair("extensions/common/mojo/keep_alive.mojom", |
| 579 IDR_KEEP_ALIVE_MOJOM_JS)); |
| 577 | 580 |
| 578 // Custom bindings. | 581 // Custom bindings. |
| 579 resources.push_back( | 582 resources.push_back( |
| 580 std::make_pair("app.runtime", IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS)); | 583 std::make_pair("app.runtime", IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS)); |
| 581 resources.push_back( | 584 resources.push_back( |
| 582 std::make_pair("app.window", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS)); | 585 std::make_pair("app.window", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS)); |
| 583 resources.push_back( | 586 resources.push_back( |
| 584 std::make_pair("declarativeWebRequest", | 587 std::make_pair("declarativeWebRequest", |
| 585 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS)); | 588 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS)); |
| 586 resources.push_back( | 589 resources.push_back( |
| (...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1390 return v8::Handle<v8::Object>(); | 1393 return v8::Handle<v8::Object>(); |
| 1391 | 1394 |
| 1392 if (bind_name) | 1395 if (bind_name) |
| 1393 *bind_name = split.back(); | 1396 *bind_name = split.back(); |
| 1394 | 1397 |
| 1395 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context)) | 1398 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context)) |
| 1396 : bind_object; | 1399 : bind_object; |
| 1397 } | 1400 } |
| 1398 | 1401 |
| 1399 } // namespace extensions | 1402 } // namespace extensions |
| OLD | NEW |