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

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

Issue 1165773004: Extract the element implementation logic to function mods in <webview>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@qui
Patch Set: Clean up Created 5 years, 6 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 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 resources.push_back(std::make_pair( 465 resources.push_back(std::make_pair(
466 "extensionViewInternal", IDR_EXTENSION_VIEW_INTERNAL_CUSTOM_BINDINGS_JS)); 466 "extensionViewInternal", IDR_EXTENSION_VIEW_INTERNAL_CUSTOM_BINDINGS_JS));
467 resources.push_back(std::make_pair("guestView", IDR_GUEST_VIEW_JS)); 467 resources.push_back(std::make_pair("guestView", IDR_GUEST_VIEW_JS));
468 resources.push_back(std::make_pair("guestViewAttributes", 468 resources.push_back(std::make_pair("guestViewAttributes",
469 IDR_GUEST_VIEW_ATTRIBUTES_JS)); 469 IDR_GUEST_VIEW_ATTRIBUTES_JS));
470 resources.push_back(std::make_pair("guestViewContainer", 470 resources.push_back(std::make_pair("guestViewContainer",
471 IDR_GUEST_VIEW_CONTAINER_JS)); 471 IDR_GUEST_VIEW_CONTAINER_JS));
472 resources.push_back(std::make_pair("guestViewDeny", IDR_GUEST_VIEW_DENY_JS)); 472 resources.push_back(std::make_pair("guestViewDeny", IDR_GUEST_VIEW_DENY_JS));
473 resources.push_back(std::make_pair("guestViewEvents", 473 resources.push_back(std::make_pair("guestViewEvents",
474 IDR_GUEST_VIEW_EVENTS_JS)); 474 IDR_GUEST_VIEW_EVENTS_JS));
475
476 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
477 ::switches::kSitePerProcess)) {
478 resources.push_back(std::make_pair("guestViewIframe",
479 IDR_GUEST_VIEW_IFRAME_JS));
480 resources.push_back(std::make_pair("guestViewIframeContainer",
481 IDR_GUEST_VIEW_IFRAME_CONTAINER_JS));
482 }
483
475 resources.push_back(std::make_pair("imageUtil", IDR_IMAGE_UTIL_JS)); 484 resources.push_back(std::make_pair("imageUtil", IDR_IMAGE_UTIL_JS));
476 resources.push_back(std::make_pair("json_schema", IDR_JSON_SCHEMA_JS)); 485 resources.push_back(std::make_pair("json_schema", IDR_JSON_SCHEMA_JS));
477 resources.push_back(std::make_pair("lastError", IDR_LAST_ERROR_JS)); 486 resources.push_back(std::make_pair("lastError", IDR_LAST_ERROR_JS));
478 resources.push_back(std::make_pair("messaging", IDR_MESSAGING_JS)); 487 resources.push_back(std::make_pair("messaging", IDR_MESSAGING_JS));
479 resources.push_back(std::make_pair("messaging_utils", 488 resources.push_back(std::make_pair("messaging_utils",
480 IDR_MESSAGING_UTILS_JS)); 489 IDR_MESSAGING_UTILS_JS));
481 resources.push_back(std::make_pair(kSchemaUtils, IDR_SCHEMA_UTILS_JS)); 490 resources.push_back(std::make_pair(kSchemaUtils, IDR_SCHEMA_UTILS_JS));
482 resources.push_back(std::make_pair("sendRequest", IDR_SEND_REQUEST_JS)); 491 resources.push_back(std::make_pair("sendRequest", IDR_SEND_REQUEST_JS));
483 resources.push_back(std::make_pair("setIcon", IDR_SET_ICON_JS)); 492 resources.push_back(std::make_pair("setIcon", IDR_SET_ICON_JS));
484 resources.push_back(std::make_pair("surfaceWorker", IDR_SURFACE_VIEW_JS)); 493 resources.push_back(std::make_pair("surfaceWorker", IDR_SURFACE_VIEW_JS));
(...skipping 17 matching lines...) Expand all
502 IDR_WEB_VIEW_ACTION_REQUESTS_JS)); 511 IDR_WEB_VIEW_ACTION_REQUESTS_JS));
503 resources.push_back(std::make_pair("webViewApiMethods", 512 resources.push_back(std::make_pair("webViewApiMethods",
504 IDR_WEB_VIEW_API_METHODS_JS)); 513 IDR_WEB_VIEW_API_METHODS_JS));
505 resources.push_back(std::make_pair("webViewAttributes", 514 resources.push_back(std::make_pair("webViewAttributes",
506 IDR_WEB_VIEW_ATTRIBUTES_JS)); 515 IDR_WEB_VIEW_ATTRIBUTES_JS));
507 resources.push_back(std::make_pair("webViewConstants", 516 resources.push_back(std::make_pair("webViewConstants",
508 IDR_WEB_VIEW_CONSTANTS_JS)); 517 IDR_WEB_VIEW_CONSTANTS_JS));
509 resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS)); 518 resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS));
510 resources.push_back(std::make_pair("webViewInternal", 519 resources.push_back(std::make_pair("webViewInternal",
511 IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS)); 520 IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS));
521 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
522 ::switches::kSitePerProcess)) {
523 resources.push_back(std::make_pair("webViewIframe",
524 IDR_WEB_VIEW_IFRAME_JS));
525 }
512 resources.push_back( 526 resources.push_back(
513 std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS)); 527 std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS));
514 resources.push_back( 528 resources.push_back(
515 std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS)); 529 std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS));
516 resources.push_back( 530 resources.push_back(
517 std::make_pair(mojo::kCodecModuleName, IDR_MOJO_CODEC_JS)); 531 std::make_pair(mojo::kCodecModuleName, IDR_MOJO_CODEC_JS));
518 resources.push_back( 532 resources.push_back(
519 std::make_pair(mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS)); 533 std::make_pair(mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS));
520 resources.push_back( 534 resources.push_back(
521 std::make_pair(mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS)); 535 std::make_pair(mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS));
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after
1402 if (extensions::FeatureSwitch::surface_worker()->IsEnabled() && 1416 if (extensions::FeatureSwitch::surface_worker()->IsEnabled() &&
1403 context->GetAvailability("surfaceWorkerInternal").is_available()) { 1417 context->GetAvailability("surfaceWorkerInternal").is_available()) {
1404 module_system->Require("surfaceWorker"); 1418 module_system->Require("surfaceWorker");
1405 } 1419 }
1406 1420
1407 // Require WebView. 1421 // Require WebView.
1408 if (context->GetAvailability("webViewInternal").is_available()) { 1422 if (context->GetAvailability("webViewInternal").is_available()) {
1409 module_system->Require("webView"); 1423 module_system->Require("webView");
1410 module_system->Require("webViewApiMethods"); 1424 module_system->Require("webViewApiMethods");
1411 module_system->Require("webViewAttributes"); 1425 module_system->Require("webViewAttributes");
1426
1427 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
1428 ::switches::kSitePerProcess)) {
1429 module_system->Require("webViewIframe");
1430 }
1412 } 1431 }
1413 1432
1414 // The "guestViewDeny" module must always be loaded last. It registers 1433 // The "guestViewDeny" module must always be loaded last. It registers
1415 // error-providing custom elements for the GuestView types that are not 1434 // error-providing custom elements for the GuestView types that are not
1416 // available, and thus all of those types must have been checked and loaded 1435 // available, and thus all of those types must have been checked and loaded
1417 // (or not loaded) beforehand. 1436 // (or not loaded) beforehand.
1418 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1437 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1419 module_system->Require("guestViewDeny"); 1438 module_system->Require("guestViewDeny");
1420 } 1439 }
1421 } 1440 }
1422 1441
1423 } // namespace extensions 1442 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698