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

Side by Side Diff: chrome/renderer/extensions/extension_dispatcher.cc

Issue 10659021: Move chrome.appWindow to chrome.app.window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 8 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/renderer/extensions/extension_dispatcher.h" 5 #include "chrome/renderer/extensions/extension_dispatcher.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/string_piece.h" 10 #include "base/string_piece.h"
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 603
604 // Libraries. 604 // Libraries.
605 source_map_.RegisterSource("lastError", IDR_LAST_ERROR_JS); 605 source_map_.RegisterSource("lastError", IDR_LAST_ERROR_JS);
606 source_map_.RegisterSource("schemaUtils", IDR_SCHEMA_UTILS_JS); 606 source_map_.RegisterSource("schemaUtils", IDR_SCHEMA_UTILS_JS);
607 source_map_.RegisterSource("sendRequest", IDR_SEND_REQUEST_JS); 607 source_map_.RegisterSource("sendRequest", IDR_SEND_REQUEST_JS);
608 source_map_.RegisterSource("setIcon", IDR_SET_ICON_JS); 608 source_map_.RegisterSource("setIcon", IDR_SET_ICON_JS);
609 source_map_.RegisterSource("utils", IDR_UTILS_JS); 609 source_map_.RegisterSource("utils", IDR_UTILS_JS);
610 610
611 // Custom bindings. 611 // Custom bindings.
612 source_map_.RegisterSource("app", IDR_APP_CUSTOM_BINDINGS_JS); 612 source_map_.RegisterSource("app", IDR_APP_CUSTOM_BINDINGS_JS);
613 source_map_.RegisterSource("appWindow", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS); 613 source_map_.RegisterSource("app.window", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS);
614 source_map_.RegisterSource("browserAction", 614 source_map_.RegisterSource("browserAction",
615 IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS); 615 IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS);
616 source_map_.RegisterSource("contentSettings", 616 source_map_.RegisterSource("contentSettings",
617 IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS); 617 IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS);
618 source_map_.RegisterSource("contextMenus", 618 source_map_.RegisterSource("contextMenus",
619 IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS); 619 IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS);
620 source_map_.RegisterSource("declarativeWebRequest", 620 source_map_.RegisterSource("declarativeWebRequest",
621 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS); 621 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS);
622 source_map_.RegisterSource("devtools", IDR_DEVTOOLS_CUSTOM_BINDINGS_JS); 622 source_map_.RegisterSource("devtools", IDR_DEVTOOLS_CUSTOM_BINDINGS_JS);
623 source_map_.RegisterSource("experimental.app", 623 source_map_.RegisterSource("experimental.app",
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 // APIs, they don't get extension bindings injected. If we end up here it 1068 // APIs, they don't get extension bindings injected. If we end up here it
1069 // means that a sandboxed page somehow managed to invoke an API anyway, so 1069 // means that a sandboxed page somehow managed to invoke an API anyway, so
1070 // we should abort. 1070 // we should abort.
1071 WebKit::WebFrame* frame = context->web_frame(); 1071 WebKit::WebFrame* frame = context->web_frame();
1072 ExtensionURLInfo url_info(frame->document().securityOrigin(), 1072 ExtensionURLInfo url_info(frame->document().securityOrigin(),
1073 extensions::UserScriptSlave::GetDataSourceURLForFrame(frame)); 1073 extensions::UserScriptSlave::GetDataSourceURLForFrame(frame));
1074 CHECK(!extensions_.IsSandboxedPage(url_info)); 1074 CHECK(!extensions_.IsSandboxedPage(url_info));
1075 1075
1076 return true; 1076 return true;
1077 } 1077 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698