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

Unified Diff: extensions/shell/renderer/shell_content_renderer_client.cc

Issue 1301653005: Setup for moving getUserMedia to secure origins only (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Comment update and code simplification Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: extensions/shell/renderer/shell_content_renderer_client.cc
diff --git a/extensions/shell/renderer/shell_content_renderer_client.cc b/extensions/shell/renderer/shell_content_renderer_client.cc
index 4ac5cfea1259a70826964567c5ba0bc9dcb1204f..d13fa6a2acd2b1680d06b50e2cac207ed81f405a 100644
--- a/extensions/shell/renderer/shell_content_renderer_client.cc
+++ b/extensions/shell/renderer/shell_content_renderer_client.cc
@@ -4,11 +4,13 @@
#include "extensions/shell/renderer/shell_content_renderer_client.h"
+#include "base/strings/utf_string_conversions.h"
#include "content/public/common/content_constants.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_frame_observer.h"
#include "content/public/renderer/render_frame_observer_tracker.h"
#include "content/public/renderer/render_thread.h"
+#include "extensions/common/constants.h"
#include "extensions/common/extensions_client.h"
#include "extensions/renderer/dispatcher.h"
#include "extensions/renderer/dispatcher_delegate.h"
@@ -20,6 +22,7 @@
#include "extensions/shell/common/shell_extensions_client.h"
#include "extensions/shell/renderer/shell_extensions_renderer_client.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
+#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
Devlin 2015/08/20 18:29:34 don't need this includes now.
jww 2015/08/20 22:59:03 Done.
#if !defined(DISABLE_NACL)
#include "components/nacl/common/nacl_constants.h"
@@ -59,9 +62,6 @@ void ShellContentRendererClient::RenderThreadStarted() {
guest_view_container_dispatcher_.reset(
new ExtensionsGuestViewContainerDispatcher());
thread->AddObserver(guest_view_container_dispatcher_.get());
-
- // TODO(jamescook): Init WebSecurityPolicy for chrome-extension: schemes.
- // See ChromeContentRendererClient for details.
}
void ShellContentRendererClient::RenderFrameCreated(
« chrome/renderer/chrome_content_renderer_client.cc ('K') | « extensions/renderer/dispatcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698