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

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

Issue 1614703003: Revert of Implement webview.captureVisibleRegion() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 IDR_WEB_VIEW_ACTION_REQUESTS_JS)); 637 IDR_WEB_VIEW_ACTION_REQUESTS_JS));
638 resources.push_back(std::make_pair("webViewApiMethods", 638 resources.push_back(std::make_pair("webViewApiMethods",
639 IDR_WEB_VIEW_API_METHODS_JS)); 639 IDR_WEB_VIEW_API_METHODS_JS));
640 resources.push_back(std::make_pair("webViewAttributes", 640 resources.push_back(std::make_pair("webViewAttributes",
641 IDR_WEB_VIEW_ATTRIBUTES_JS)); 641 IDR_WEB_VIEW_ATTRIBUTES_JS));
642 resources.push_back(std::make_pair("webViewConstants", 642 resources.push_back(std::make_pair("webViewConstants",
643 IDR_WEB_VIEW_CONSTANTS_JS)); 643 IDR_WEB_VIEW_CONSTANTS_JS));
644 resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS)); 644 resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS));
645 resources.push_back(std::make_pair("webViewInternal", 645 resources.push_back(std::make_pair("webViewInternal",
646 IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS)); 646 IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS));
647 resources.push_back(std::make_pair("webViewExperimental",
648 IDR_WEB_VIEW_EXPERIMENTAL_JS));
649 if (content::BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) { 647 if (content::BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
650 resources.push_back(std::make_pair("webViewIframe", 648 resources.push_back(std::make_pair("webViewIframe",
651 IDR_WEB_VIEW_IFRAME_JS)); 649 IDR_WEB_VIEW_IFRAME_JS));
652 } 650 }
653 resources.push_back( 651 resources.push_back(
654 std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS)); 652 std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS));
655 resources.push_back( 653 resources.push_back(
656 std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS)); 654 std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS));
657 resources.push_back( 655 resources.push_back(
658 std::make_pair(mojo::kCodecModuleName, IDR_MOJO_CODEC_JS)); 656 std::make_pair(mojo::kCodecModuleName, IDR_MOJO_CODEC_JS));
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
1592 module_system->Require("extensionView"); 1590 module_system->Require("extensionView");
1593 module_system->Require("extensionViewApiMethods"); 1591 module_system->Require("extensionViewApiMethods");
1594 module_system->Require("extensionViewAttributes"); 1592 module_system->Require("extensionViewAttributes");
1595 } 1593 }
1596 1594
1597 // Require WebView. 1595 // Require WebView.
1598 if (context->GetAvailability("webViewInternal").is_available()) { 1596 if (context->GetAvailability("webViewInternal").is_available()) {
1599 module_system->Require("webView"); 1597 module_system->Require("webView");
1600 module_system->Require("webViewApiMethods"); 1598 module_system->Require("webViewApiMethods");
1601 module_system->Require("webViewAttributes"); 1599 module_system->Require("webViewAttributes");
1602 if (context->GetAvailability("webViewExperimentalInternal")
1603 .is_available()) {
1604 module_system->Require("webViewExperimental");
1605 }
1606 1600
1607 if (content::BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) { 1601 if (content::BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
1608 module_system->Require("webViewIframe"); 1602 module_system->Require("webViewIframe");
1609 } 1603 }
1610 } 1604 }
1611 1605
1612 // The "guestViewDeny" module must always be loaded last. It registers 1606 // The "guestViewDeny" module must always be loaded last. It registers
1613 // error-providing custom elements for the GuestView types that are not 1607 // error-providing custom elements for the GuestView types that are not
1614 // available, and thus all of those types must have been checked and loaded 1608 // available, and thus all of those types must have been checked and loaded
1615 // (or not loaded) beforehand. 1609 // (or not loaded) beforehand.
1616 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1610 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1617 module_system->Require("guestViewDeny"); 1611 module_system->Require("guestViewDeny");
1618 } 1612 }
1619 } 1613 }
1620 1614
1621 } // namespace extensions 1615 } // 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