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

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: rebased 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 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 589
590 // Libraries. 590 // Libraries.
591 source_map_.RegisterSource("lastError", IDR_LAST_ERROR_JS); 591 source_map_.RegisterSource("lastError", IDR_LAST_ERROR_JS);
592 source_map_.RegisterSource("schemaUtils", IDR_SCHEMA_UTILS_JS); 592 source_map_.RegisterSource("schemaUtils", IDR_SCHEMA_UTILS_JS);
593 source_map_.RegisterSource("sendRequest", IDR_SEND_REQUEST_JS); 593 source_map_.RegisterSource("sendRequest", IDR_SEND_REQUEST_JS);
594 source_map_.RegisterSource("setIcon", IDR_SET_ICON_JS); 594 source_map_.RegisterSource("setIcon", IDR_SET_ICON_JS);
595 source_map_.RegisterSource("utils", IDR_UTILS_JS); 595 source_map_.RegisterSource("utils", IDR_UTILS_JS);
596 596
597 // Custom bindings. 597 // Custom bindings.
598 source_map_.RegisterSource("app", IDR_APP_CUSTOM_BINDINGS_JS); 598 source_map_.RegisterSource("app", IDR_APP_CUSTOM_BINDINGS_JS);
599 source_map_.RegisterSource("appWindow", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS); 599 source_map_.RegisterSource("app.window", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS);
600 source_map_.RegisterSource("browserAction", 600 source_map_.RegisterSource("browserAction",
601 IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS); 601 IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS);
602 source_map_.RegisterSource("contentSettings", 602 source_map_.RegisterSource("contentSettings",
603 IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS); 603 IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS);
604 source_map_.RegisterSource("contextMenus", 604 source_map_.RegisterSource("contextMenus",
605 IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS); 605 IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS);
606 source_map_.RegisterSource("declarativeWebRequest", 606 source_map_.RegisterSource("declarativeWebRequest",
607 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS); 607 IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS);
608 source_map_.RegisterSource("devtools", IDR_DEVTOOLS_CUSTOM_BINDINGS_JS); 608 source_map_.RegisterSource("devtools", IDR_DEVTOOLS_CUSTOM_BINDINGS_JS);
609 source_map_.RegisterSource("experimental.app", 609 source_map_.RegisterSource("experimental.app",
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 // APIs, they don't get extension bindings injected. If we end up here it 1062 // APIs, they don't get extension bindings injected. If we end up here it
1063 // means that a sandboxed page somehow managed to invoke an API anyway, so 1063 // means that a sandboxed page somehow managed to invoke an API anyway, so
1064 // we should abort. 1064 // we should abort.
1065 WebKit::WebFrame* frame = context->web_frame(); 1065 WebKit::WebFrame* frame = context->web_frame();
1066 ExtensionURLInfo url_info(frame->document().securityOrigin(), 1066 ExtensionURLInfo url_info(frame->document().securityOrigin(),
1067 extensions::UserScriptSlave::GetDataSourceURLForFrame(frame)); 1067 extensions::UserScriptSlave::GetDataSourceURLForFrame(frame));
1068 CHECK(!extensions_.IsSandboxedPage(url_info)); 1068 CHECK(!extensions_.IsSandboxedPage(url_info));
1069 1069
1070 return true; 1070 return true;
1071 } 1071 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698