summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 20:27:42 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 20:27:42 +0000
commit885c0e94fd5e3d81bb258191d720b7b22ca683df (patch)
tree27022b02d52dda9e1cb8b86cde08c86220615f56 /chrome/renderer
parentbf4d4efcd977d9f4438725d77e6bc9e02aac4b1c (diff)
downloadchromium_src-885c0e94fd5e3d81bb258191d720b7b22ca683df.zip
chromium_src-885c0e94fd5e3d81bb258191d720b7b22ca683df.tar.gz
chromium_src-885c0e94fd5e3d81bb258191d720b7b22ca683df.tar.bz2
Establish /extensions directory and move URLPattern there.
This doesn't create an extensions gyp target, or a module with a public API. It does set of DEPS rules and seems like it will make it easier for people to write correctly layered code today, while we are in transition. BUG=159265 TBR=ben@chromium.org Review URL: https://codereview.chromium.org/11410015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/DEPS1
-rw-r--r--chrome/renderer/chrome_content_renderer_client.cc16
-rw-r--r--chrome/renderer/chrome_render_view_observer.cc17
-rw-r--r--chrome/renderer/content_settings_observer.cc5
-rw-r--r--chrome/renderer/content_settings_observer_unittest.cc3
-rw-r--r--chrome/renderer/extensions/chrome_v8_context_set.cc11
-rw-r--r--chrome/renderer/extensions/extension_helper.cc5
-rw-r--r--chrome/renderer/extensions/file_system_natives.cc5
-rw-r--r--chrome/renderer/extensions/resource_request_policy.cc9
-rw-r--r--chrome/renderer/page_load_histograms.cc4
10 files changed, 43 insertions, 33 deletions
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index 768d625..ced815f 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -3,6 +3,7 @@ include_rules = [
# TODO(jam): remove this once all of chrome doesn't depend on content/common.
"-content/common",
"+content/public/renderer",
+ "+extensions/common",
"+grit", # For generated headers
"+media/base", # For initializing media library and media switches.
"+ppapi/native_client/src/trusted/plugin/nacl_entry_points.h", # For NaCl registration.
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index e21d588..522b9a6 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -69,11 +69,15 @@
#include "content/public/renderer/render_thread.h"
#include "content/public/renderer/render_view.h"
#include "content/public/renderer/render_view_visitor.h"
+#include "extensions/common/constants.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
#include "grit/renderer_resources.h"
#include "ipc/ipc_sync_channel.h"
#include "net/base/net_errors.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ -81,9 +85,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
@@ -237,7 +238,7 @@ void ChromeContentRendererClient::RenderThreadStarted() {
// content warnings.
WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme);
- WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme));
+ WebString extension_scheme(ASCIIToUTF16(extensions::kExtensionScheme));
WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme);
// chrome-extension: resources should be allowed to receive CORS requests.
@@ -323,7 +324,7 @@ std::string ChromeContentRendererClient::GetDefaultEncoding() {
const extensions::Extension* ChromeContentRendererClient::GetExtension(
const WebSecurityOrigin& origin) const {
- if (!EqualsASCII(origin.protocol(), chrome::kExtensionScheme))
+ if (!EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
return NULL;
const std::string extension_id = origin.host().utf8().data();
@@ -716,7 +717,8 @@ void ChromeContentRendererClient::GetNavigationErrorStrings(
error.domain == WebString::fromUTF8(net::kErrorDomain) &&
EqualsASCII(failed_request.httpMethod(), "POST");
- if (failed_url.is_valid() && !failed_url.SchemeIs(chrome::kExtensionScheme)) {
+ if (failed_url.is_valid() &&
+ !failed_url.SchemeIs(extensions::kExtensionScheme)) {
extension = extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
ExtensionURLInfo(failed_url));
}
@@ -836,7 +838,7 @@ bool ChromeContentRendererClient::WillSendRequest(WebKit::WebFrame* frame,
GURL* new_url) {
// Check whether the request should be allowed. If not allowed, we reset the
// URL to something invalid to prevent the request and cause an error.
- if (url.SchemeIs(chrome::kExtensionScheme) &&
+ if (url.SchemeIs(extensions::kExtensionScheme) &&
!extensions::ResourceRequestPolicy::CanRequestResource(
url,
frame,
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc
index 4c26192..fca9e75 100644
--- a/chrome/renderer/chrome_render_view_observer.cc
+++ b/chrome/renderer/chrome_render_view_observer.cc
@@ -27,29 +27,30 @@
#include "chrome/renderer/translate_helper.h"
#include "chrome/renderer/webview_color_overlay.h"
#include "content/public/common/bindings_policy.h"
-#include "content/public/renderer/render_view.h"
#include "content/public/renderer/content_renderer_client.h"
+#include "content/public/renderer/render_view.h"
+#include "extensions/common/constants.h"
#include "net/base/data_url.h"
#include "skia/ext/platform_canvas.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "ui/gfx/favicon_size.h"
#include "ui/gfx/size.h"
#include "ui/gfx/skbitmap_operations.h"
+#include "v8/include/v8-testing.h"
#include "webkit/glue/image_decoder.h"
#include "webkit/glue/multi_resolution_image_resource_fetcher.h"
#include "webkit/glue/webkit_glue.h"
-#include "v8/include/v8-testing.h"
using WebKit::WebAccessibilityObject;
using WebKit::WebCString;
@@ -475,7 +476,7 @@ bool ChromeRenderViewObserver::allowWriteToClipboard(WebFrame* frame,
const extensions::Extension* ChromeRenderViewObserver::GetExtension(
const WebSecurityOrigin& origin) const {
- if (!EqualsASCII(origin.protocol(), chrome::kExtensionScheme))
+ if (!EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
return NULL;
const std::string extension_id = origin.host().utf8().data();
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index dd1790c..76c6e741 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -9,12 +9,13 @@
#include "content/public/renderer/document_state.h"
#include "content/public/renderer/navigation_state.h"
#include "content/public/renderer/render_view.h"
+#include "extensions/common/constants.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "webkit/glue/weburlresponse_extradata_impl.h"
@@ -343,7 +344,7 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings(
if (EqualsASCII(origin.protocol(), chrome::kChromeDevToolsScheme))
return true; // DevTools UI elements should still work.
- if (EqualsASCII(origin.protocol(), chrome::kExtensionScheme))
+ if (EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
return true;
if (EqualsASCII(origin.protocol(), chrome::kChromeInternalScheme))
diff --git a/chrome/renderer/content_settings_observer_unittest.cc b/chrome/renderer/content_settings_observer_unittest.cc
index de49b71..32a473d 100644
--- a/chrome/renderer/content_settings_observer_unittest.cc
+++ b/chrome/renderer/content_settings_observer_unittest.cc
@@ -6,6 +6,7 @@
#include "chrome/common/url_constants.h"
#include "content/public/common/url_constants.h"
+#include "extensions/common/constants.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
@@ -30,7 +31,7 @@ TEST_F(ContentSettingsObserverTest, WhitelistedSchemes) {
GURL()));
GURL extension_url =
- GURL(std::string(chrome::kExtensionScheme).append(end_url));
+ GURL(std::string(extensions::kExtensionScheme).append(end_url));
EXPECT_TRUE(ContentSettingsObserver::IsWhitelistedForContentSettings(
WebSecurityOrigin::create(extension_url),
GURL()));
diff --git a/chrome/renderer/extensions/chrome_v8_context_set.cc b/chrome/renderer/extensions/chrome_v8_context_set.cc
index 62a1144..49d016c 100644
--- a/chrome/renderer/extensions/chrome_v8_context_set.cc
+++ b/chrome/renderer/extensions/chrome_v8_context_set.cc
@@ -12,14 +12,15 @@
#include "chrome/common/url_constants.h"
#include "chrome/renderer/extensions/chrome_v8_context.h"
#include "content/public/renderer/render_thread.h"
-#include "content/public/renderer/v8_value_converter.h"
#include "content/public/renderer/render_view.h"
-#include "v8/include/v8.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "content/public/renderer/v8_value_converter.h"
+#include "extensions/common/constants.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "v8/include/v8.h"
using content::RenderThread;
using content::V8ValueConverter;
@@ -43,7 +44,7 @@ namespace {
WebKit::WebDocument document =
render_view->GetWebView()->mainFrame()->document();
- return GURL(document.url()).SchemeIs(chrome::kExtensionScheme) &&
+ return GURL(document.url()).SchemeIs(extensions::kExtensionScheme) &&
document.securityOrigin().canRequest(event_url);
}
diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc
index 893c0f1..2252186 100644
--- a/chrome/renderer/extensions/extension_helper.cc
+++ b/chrome/renderer/extensions/extension_helper.cc
@@ -23,10 +23,11 @@
#include "chrome/renderer/extensions/user_script_slave.h"
#include "content/public/renderer/render_view.h"
#include "content/public/renderer/render_view_visitor.h"
+#include "extensions/common/constants.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedUserGesture.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "webkit/glue/image_resource_fetcher.h"
@@ -80,7 +81,7 @@ class ViewAccumulator : public content::RenderViewVisitor {
return true;
GURL url = render_view->GetWebView()->mainFrame()->document().url();
- if (!url.SchemeIs(chrome::kExtensionScheme))
+ if (!url.SchemeIs(extensions::kExtensionScheme))
return true;
const std::string& extension_id = url.host();
if (extension_id != extension_id_)
diff --git a/chrome/renderer/extensions/file_system_natives.cc b/chrome/renderer/extensions/file_system_natives.cc
index 6b6e029..3239c47 100644
--- a/chrome/renderer/extensions/file_system_natives.cc
+++ b/chrome/renderer/extensions/file_system_natives.cc
@@ -10,10 +10,11 @@
#include "base/logging.h"
#include "chrome/common/url_constants.h"
#include "chrome/renderer/extensions/user_script_slave.h"
+#include "extensions/common/constants.h"
#include "grit/renderer_resources.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "webkit/fileapi/file_system_types.h"
#include "webkit/fileapi/file_system_util.h"
@@ -29,7 +30,7 @@ static v8::Handle<v8::Value> GetIsolatedFileSystem(
GURL context_url =
extensions::UserScriptSlave::GetDataSourceURLForFrame(webframe);
- CHECK(context_url.SchemeIs(chrome::kExtensionScheme));
+ CHECK(context_url.SchemeIs(extensions::kExtensionScheme));
std::string name(fileapi::GetIsolatedFileSystemName(context_url.GetOrigin(),
file_system_id));
diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc
index da83a32..d6ac03a 100644
--- a/chrome/renderer/extensions/resource_request_policy.cc
+++ b/chrome/renderer/extensions/resource_request_policy.cc
@@ -8,15 +8,16 @@
#include "base/logging.h"
#include "base/stringprintf.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/url_constants.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_set.h"
+#include "chrome/common/url_constants.h"
#include "content/public/common/page_transition_types.h"
+#include "extensions/common/constants.h"
#include "googleurl/src/gurl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
namespace extensions {
@@ -26,7 +27,7 @@ bool ResourceRequestPolicy::CanRequestResource(
WebKit::WebFrame* frame,
content::PageTransition transition_type,
const ExtensionSet* loaded_extensions) {
- CHECK(resource_url.SchemeIs(chrome::kExtensionScheme));
+ CHECK(resource_url.SchemeIs(extensions::kExtensionScheme));
const Extension* extension =
loaded_extensions->GetExtensionOrAppByURL(ExtensionURLInfo(resource_url));
@@ -99,7 +100,7 @@ bool ResourceRequestPolicy::CanRequestExtensionResourceScheme(
GURL frame_url = frame->document().url();
if (!frame_url.is_empty() &&
- !frame_url.SchemeIs(chrome::kExtensionScheme)) {
+ !frame_url.SchemeIs(extensions::kExtensionScheme)) {
std::string message = base::StringPrintf(
"Denying load of %s. chrome-extension-resources:// can only be "
"loaded from extensions.",
diff --git a/chrome/renderer/page_load_histograms.cc b/chrome/renderer/page_load_histograms.cc
index 39c11ac..4398f2d 100644
--- a/chrome/renderer/page_load_histograms.cc
+++ b/chrome/renderer/page_load_histograms.cc
@@ -10,18 +10,18 @@
#include "base/metrics/histogram.h"
#include "base/time.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/url_pattern.h"
#include "chrome/renderer/chrome_content_renderer_client.h"
#include "chrome/renderer/prerender/prerender_helper.h"
#include "content/public/common/content_constants.h"
#include "content/public/renderer/document_state.h"
#include "content/public/renderer/render_thread.h"
#include "content/public/renderer/render_view.h"
+#include "extensions/common/url_pattern.h"
#include "googleurl/src/gurl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPerformance.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
using WebKit::WebDataSource;
generated by cgit v1.1 at 2025-03-05 19:04:32 +0000