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

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

Issue 620623002: Revert "Allow declarative webrequest and webrequest in extensions." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 resources.push_back( 572 resources.push_back(
573 std::make_pair("contextMenus", IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS)); 573 std::make_pair("contextMenus", IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS));
574 resources.push_back( 574 resources.push_back(
575 std::make_pair("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS)); 575 std::make_pair("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS));
576 resources.push_back(std::make_pair("i18n", IDR_I18N_CUSTOM_BINDINGS_JS)); 576 resources.push_back(std::make_pair("i18n", IDR_I18N_CUSTOM_BINDINGS_JS));
577 resources.push_back( 577 resources.push_back(
578 std::make_pair("permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS)); 578 std::make_pair("permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS));
579 resources.push_back( 579 resources.push_back(
580 std::make_pair("runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS)); 580 std::make_pair("runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS));
581 resources.push_back(std::make_pair("windowControls", IDR_WINDOW_CONTROLS_JS)); 581 resources.push_back(std::make_pair("windowControls", IDR_WINDOW_CONTROLS_JS));
582 resources.push_back(
583 std::make_pair("webViewRequest",
584 IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS));
585 resources.push_back(std::make_pair("binding", IDR_BINDING_JS)); 582 resources.push_back(std::make_pair("binding", IDR_BINDING_JS));
586 583
587 // Custom types sources. 584 // Custom types sources.
588 resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS)); 585 resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS));
589 586
590 // Platform app sources that are not API-specific.. 587 // Platform app sources that are not API-specific..
591 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS)); 588 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS));
592 589
593 return resources; 590 return resources;
594 } 591 }
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
1376 return v8::Handle<v8::Object>(); 1373 return v8::Handle<v8::Object>();
1377 1374
1378 if (bind_name) 1375 if (bind_name)
1379 *bind_name = split.back(); 1376 *bind_name = split.back();
1380 1377
1381 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context)) 1378 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context))
1382 : bind_object; 1379 : bind_object;
1383 } 1380 }
1384 1381
1385 } // namespace extensions 1382 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/renderer/BUILD.gn ('k') | extensions/renderer/resources/extensions_renderer_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698