Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(208)

Side by Side Diff: extensions/renderer/dispatcher.cc

Issue 1131043003: Revert 2.5 CLs that relate to pulling Extension port management out of messaging.js. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert test Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 IDR_GUEST_VIEW_CONTAINER_JS)); 472 IDR_GUEST_VIEW_CONTAINER_JS));
473 resources.push_back(std::make_pair("guestViewDeny", IDR_GUEST_VIEW_DENY_JS)); 473 resources.push_back(std::make_pair("guestViewDeny", IDR_GUEST_VIEW_DENY_JS));
474 resources.push_back(std::make_pair("guestViewEvents", 474 resources.push_back(std::make_pair("guestViewEvents",
475 IDR_GUEST_VIEW_EVENTS_JS)); 475 IDR_GUEST_VIEW_EVENTS_JS));
476 resources.push_back(std::make_pair("imageUtil", IDR_IMAGE_UTIL_JS)); 476 resources.push_back(std::make_pair("imageUtil", IDR_IMAGE_UTIL_JS));
477 resources.push_back(std::make_pair("json_schema", IDR_JSON_SCHEMA_JS)); 477 resources.push_back(std::make_pair("json_schema", IDR_JSON_SCHEMA_JS));
478 resources.push_back(std::make_pair("lastError", IDR_LAST_ERROR_JS)); 478 resources.push_back(std::make_pair("lastError", IDR_LAST_ERROR_JS));
479 resources.push_back(std::make_pair("messaging", IDR_MESSAGING_JS)); 479 resources.push_back(std::make_pair("messaging", IDR_MESSAGING_JS));
480 resources.push_back(std::make_pair("messaging_utils", 480 resources.push_back(std::make_pair("messaging_utils",
481 IDR_MESSAGING_UTILS_JS)); 481 IDR_MESSAGING_UTILS_JS));
482 resources.push_back(std::make_pair("port", IDR_PORT_JS));
483 resources.push_back(std::make_pair(kSchemaUtils, IDR_SCHEMA_UTILS_JS)); 482 resources.push_back(std::make_pair(kSchemaUtils, IDR_SCHEMA_UTILS_JS));
484 resources.push_back(std::make_pair("sendRequest", IDR_SEND_REQUEST_JS)); 483 resources.push_back(std::make_pair("sendRequest", IDR_SEND_REQUEST_JS));
485 resources.push_back(std::make_pair("setIcon", IDR_SET_ICON_JS)); 484 resources.push_back(std::make_pair("setIcon", IDR_SET_ICON_JS));
486 resources.push_back(std::make_pair("surfaceWorker", IDR_SURFACE_VIEW_JS)); 485 resources.push_back(std::make_pair("surfaceWorker", IDR_SURFACE_VIEW_JS));
487 resources.push_back(std::make_pair("test", IDR_TEST_CUSTOM_BINDINGS_JS)); 486 resources.push_back(std::make_pair("test", IDR_TEST_CUSTOM_BINDINGS_JS));
488 resources.push_back( 487 resources.push_back(
489 std::make_pair("test_environment_specific_bindings", 488 std::make_pair("test_environment_specific_bindings",
490 IDR_BROWSER_TEST_ENVIRONMENT_SPECIFIC_BINDINGS_JS)); 489 IDR_BROWSER_TEST_ENVIRONMENT_SPECIFIC_BINDINGS_JS));
491 resources.push_back(std::make_pair("uncaught_exception_handler", 490 resources.push_back(std::make_pair("uncaught_exception_handler",
492 IDR_UNCAUGHT_EXCEPTION_HANDLER_JS)); 491 IDR_UNCAUGHT_EXCEPTION_HANDLER_JS));
(...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after
1411 // The "guestViewDeny" module must always be loaded last. It registers 1410 // The "guestViewDeny" module must always be loaded last. It registers
1412 // error-providing custom elements for the GuestView types that are not 1411 // error-providing custom elements for the GuestView types that are not
1413 // available, and thus all of those types must have been checked and loaded 1412 // available, and thus all of those types must have been checked and loaded
1414 // (or not loaded) beforehand. 1413 // (or not loaded) beforehand.
1415 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1414 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1416 module_system->Require("guestViewDeny"); 1415 module_system->Require("guestViewDeny");
1417 } 1416 }
1418 } 1417 }
1419 1418
1420 } // namespace extensions 1419 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/extensions.gypi ('k') | extensions/renderer/resources/extensions_renderer_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698