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

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: $Array.unshift -> $Array.concat Created 5 years, 9 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 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 resources.push_back( 655 resources.push_back(
656 std::make_pair("app.runtime", IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS)); 656 std::make_pair("app.runtime", IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS));
657 resources.push_back( 657 resources.push_back(
658 std::make_pair("app.window", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS)); 658 std::make_pair("app.window", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS));
659 resources.push_back( 659 resources.push_back(
660 std::make_pair("declarativeWebRequest", 660 std::make_pair("declarativeWebRequest",
661 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS)); 661 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS));
662 resources.push_back( 662 resources.push_back(
663 std::make_pair("contextMenus", IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS)); 663 std::make_pair("contextMenus", IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS));
664 resources.push_back( 664 resources.push_back(
665 std::make_pair("contextMenusHandlers", IDR_CONTEXT_MENUS_HANDLERS_JS));
666 resources.push_back(
665 std::make_pair("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS)); 667 std::make_pair("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS));
666 resources.push_back(std::make_pair("i18n", IDR_I18N_CUSTOM_BINDINGS_JS)); 668 resources.push_back(std::make_pair("i18n", IDR_I18N_CUSTOM_BINDINGS_JS));
667 resources.push_back(std::make_pair( 669 resources.push_back(std::make_pair(
668 "mimeHandlerPrivate", IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS)); 670 "mimeHandlerPrivate", IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS));
669 resources.push_back(std::make_pair("extensions/common/api/mime_handler.mojom", 671 resources.push_back(std::make_pair("extensions/common/api/mime_handler.mojom",
670 IDR_MIME_HANDLER_MOJOM_JS)); 672 IDR_MIME_HANDLER_MOJOM_JS));
671 resources.push_back( 673 resources.push_back(
672 std::make_pair("mojoPrivate", IDR_MOJO_PRIVATE_CUSTOM_BINDINGS_JS)); 674 std::make_pair("mojoPrivate", IDR_MOJO_PRIVATE_CUSTOM_BINDINGS_JS));
673 resources.push_back( 675 resources.push_back(
674 std::make_pair("permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS)); 676 std::make_pair("permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS));
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
1549 return v8::Handle<v8::Object>(); 1551 return v8::Handle<v8::Object>();
1550 1552
1551 if (bind_name) 1553 if (bind_name)
1552 *bind_name = split.back(); 1554 *bind_name = split.back();
1553 1555
1554 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context)) 1556 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context))
1555 : bind_object; 1557 : bind_object;
1556 } 1558 }
1557 1559
1558 } // namespace extensions 1560 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698