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

Side by Side Diff: chrome/browser/extensions/chrome_extension_web_contents_observer.cc

Issue 1362433002: Fix for "chrome://" links in PDFs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added tests. Addressed comments. Created 5 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 "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 5 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
6 6
7 #include "chrome/browser/extensions/error_console/error_console.h" 7 #include "chrome/browser/extensions/error_console/error_console.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/window_controller.h" 9 #include "chrome/browser/extensions/window_controller.h"
10 #include "chrome/common/extensions/chrome_extension_messages.h" 10 #include "chrome/common/extensions/chrome_extension_messages.h"
11 #include "chrome/common/url_constants.h"
11 #include "content/public/browser/browser_context.h" 12 #include "content/public/browser/browser_context.h"
13 #include "content/public/browser/child_process_security_policy.h"
12 #include "content/public/browser/render_frame_host.h" 14 #include "content/public/browser/render_frame_host.h"
13 #include "content/public/browser/render_process_host.h" 15 #include "content/public/browser/render_process_host.h"
14 #include "content/public/browser/render_view_host.h" 16 #include "content/public/browser/render_view_host.h"
15 #include "extensions/browser/extension_registry.h" 17 #include "extensions/browser/extension_registry.h"
16 #include "extensions/browser/extension_system.h" 18 #include "extensions/browser/extension_system.h"
17 #include "extensions/common/extension_messages.h" 19 #include "extensions/common/extension_messages.h"
18 #include "extensions/common/extension_urls.h" 20 #include "extensions/common/extension_urls.h"
19 21
20 using content::BrowserContext; 22 using content::BrowserContext;
21 23
22 DEFINE_WEB_CONTENTS_USER_DATA_KEY( 24 DEFINE_WEB_CONTENTS_USER_DATA_KEY(
23 extensions::ChromeExtensionWebContentsObserver); 25 extensions::ChromeExtensionWebContentsObserver);
24 26
25 namespace extensions { 27 namespace extensions {
26 28
27 ChromeExtensionWebContentsObserver::ChromeExtensionWebContentsObserver( 29 ChromeExtensionWebContentsObserver::ChromeExtensionWebContentsObserver(
28 content::WebContents* web_contents) 30 content::WebContents* web_contents)
29 : ExtensionWebContentsObserver(web_contents) {} 31 : ExtensionWebContentsObserver(web_contents) {}
30 32
31 ChromeExtensionWebContentsObserver::~ChromeExtensionWebContentsObserver() {} 33 ChromeExtensionWebContentsObserver::~ChromeExtensionWebContentsObserver() {}
32 34
33 void ChromeExtensionWebContentsObserver::RenderViewCreated( 35 void ChromeExtensionWebContentsObserver::RenderViewCreated(
34 content::RenderViewHost* render_view_host) { 36 content::RenderViewHost* render_view_host) {
35 ReloadIfTerminated(render_view_host); 37 ReloadIfTerminated(render_view_host);
36 ExtensionWebContentsObserver::RenderViewCreated(render_view_host); 38 ExtensionWebContentsObserver::RenderViewCreated(render_view_host);
39
40 const Extension* extension = GetExtension(render_view_host);
41 if (!extension)
42 return;
43
44 int process_id = render_view_host->GetProcess()->GetID();
45 auto policy = content::ChildProcessSecurityPolicy::GetInstance();
46
47 // Components of chrome that are implemented as extensions are allowed to use
48 // chrome://resources/ URLs.
49 if (extension->is_extension() &&
50 Manifest::IsComponentLocation(extension->location())) {
51 std::string origin_url;
52 base::SStringPrintf(&origin_url, "%s://%s/", content::kChromeUIScheme,
Devlin 2015/09/29 19:06:30 And, both those said, I actually wouldn't be oppos
Devlin 2015/09/29 19:06:30 nit: Why SStringPrintf, instead of just StringPrin
Devlin 2015/09/29 19:06:30 nit: Also kStandardSchemeSeparator
Charlie Reis 2015/09/29 22:15:53 I'd be happy with that, similar to kChromeUINetwor
paulmeyer 2015/09/30 14:21:31 Done.
paulmeyer 2015/09/30 14:21:31 No particular reason, but I'm taking it out anyway
paulmeyer 2015/09/30 14:21:31 Done.
paulmeyer 2015/09/30 14:21:31 Acknowledged.
53 content::kChromeUIResourcesHost);
54 policy->GrantOrigin(process_id, url::Origin(GURL(origin_url)));
55 }
56
57 // Extensions, legacy packaged apps, and component platform apps are allowed
58 // to use chrome://favicon/ and chrome://extension-icon/ URLs. Hosted apps are
59 // not allowed because they are served via web servers (and are generally
60 // never given access to Chrome APIs).
61 if (extension->is_extension() ||
62 extension->is_legacy_packaged_app() ||
63 (extension->is_platform_app() &&
64 Manifest::IsComponentLocation(extension->location()))) {
65 policy->GrantOrigin(process_id,
66 url::Origin(GURL(chrome::kChromeUIFaviconURL)));
67 policy->GrantOrigin(process_id,
68 url::Origin(GURL(chrome::kChromeUIExtensionIconURL)));
69 }
37 } 70 }
38 71
39 bool ChromeExtensionWebContentsObserver::OnMessageReceived( 72 bool ChromeExtensionWebContentsObserver::OnMessageReceived(
40 const IPC::Message& message, 73 const IPC::Message& message,
41 content::RenderFrameHost* render_frame_host) { 74 content::RenderFrameHost* render_frame_host) {
42 if (ExtensionWebContentsObserver::OnMessageReceived(message, 75 if (ExtensionWebContentsObserver::OnMessageReceived(message,
43 render_frame_host)) { 76 render_frame_host)) {
44 return true; 77 return true;
45 } 78 }
46 79
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // TODO(yoz): This reload doesn't happen synchronously for unpacked 131 // TODO(yoz): This reload doesn't happen synchronously for unpacked
99 // extensions. It seems to be fast enough, but there is a race. 132 // extensions. It seems to be fast enough, but there is a race.
100 // We should delay loading until the extension has reloaded. 133 // We should delay loading until the extension has reloaded.
101 if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) { 134 if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) {
102 ExtensionSystem::Get(browser_context())-> 135 ExtensionSystem::Get(browser_context())->
103 extension_service()->ReloadExtension(extension_id); 136 extension_service()->ReloadExtension(extension_id);
104 } 137 }
105 } 138 }
106 139
107 } // namespace extensions 140 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/pdf/pdf_extension_test.cc » ('j') | chrome/browser/pdf/pdf_extension_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698