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

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

Issue 948243005: Merge custom bindings for context menus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ExtensionContextMenuBrowserTest.UpdateOnclick test Created 5 years, 8 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 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 resources.push_back( 575 resources.push_back(
576 std::make_pair("app.runtime", IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS)); 576 std::make_pair("app.runtime", IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS));
577 resources.push_back( 577 resources.push_back(
578 std::make_pair("app.window", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS)); 578 std::make_pair("app.window", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS));
579 resources.push_back( 579 resources.push_back(
580 std::make_pair("declarativeWebRequest", 580 std::make_pair("declarativeWebRequest",
581 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS)); 581 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS));
582 resources.push_back( 582 resources.push_back(
583 std::make_pair("contextMenus", IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS)); 583 std::make_pair("contextMenus", IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS));
584 resources.push_back( 584 resources.push_back(
585 std::make_pair("contextMenusHandlers", IDR_CONTEXT_MENUS_HANDLERS_JS));
586 resources.push_back(
585 std::make_pair("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS)); 587 std::make_pair("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS));
586 resources.push_back(std::make_pair("i18n", IDR_I18N_CUSTOM_BINDINGS_JS)); 588 resources.push_back(std::make_pair("i18n", IDR_I18N_CUSTOM_BINDINGS_JS));
587 resources.push_back(std::make_pair( 589 resources.push_back(std::make_pair(
588 "mimeHandlerPrivate", IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS)); 590 "mimeHandlerPrivate", IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS));
589 resources.push_back(std::make_pair("extensions/common/api/mime_handler.mojom", 591 resources.push_back(std::make_pair("extensions/common/api/mime_handler.mojom",
590 IDR_MIME_HANDLER_MOJOM_JS)); 592 IDR_MIME_HANDLER_MOJOM_JS));
591 resources.push_back( 593 resources.push_back(
592 std::make_pair("mojoPrivate", IDR_MOJO_PRIVATE_CUSTOM_BINDINGS_JS)); 594 std::make_pair("mojoPrivate", IDR_MOJO_PRIVATE_CUSTOM_BINDINGS_JS));
593 resources.push_back( 595 resources.push_back(
594 std::make_pair("permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS)); 596 std::make_pair("permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS));
(...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after
1439 // The "guestViewDeny" module must always be loaded last. It registers 1441 // The "guestViewDeny" module must always be loaded last. It registers
1440 // error-providing custom elements for the GuestView types that are not 1442 // error-providing custom elements for the GuestView types that are not
1441 // available, and thus all of those types must have been checked and loaded 1443 // available, and thus all of those types must have been checked and loaded
1442 // (or not loaded) beforehand. 1444 // (or not loaded) beforehand.
1443 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1445 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1444 module_system->Require("guestViewDeny"); 1446 module_system->Require("guestViewDeny");
1445 } 1447 }
1446 } 1448 }
1447 1449
1448 } // namespace extensions 1450 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698