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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 105723002: Add the scheme chrome-distiller:// and hook up data source. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed to use onReceived for javascript Created 7 years 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/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); 274 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get());
275 if (command_line->HasSwitch(switches::kInstantProcess)) 275 if (command_line->HasSwitch(switches::kInstantProcess))
276 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); 276 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
277 277
278 if (command_line->HasSwitch(switches::kPlaybackMode) || 278 if (command_line->HasSwitch(switches::kPlaybackMode) ||
279 command_line->HasSwitch(switches::kRecordMode) || 279 command_line->HasSwitch(switches::kRecordMode) ||
280 command_line->HasSwitch(switches::kNoJsRandomness)) { 280 command_line->HasSwitch(switches::kNoJsRandomness)) {
281 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get()); 281 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get());
282 } 282 }
283 283
284 // chrome:, chrome-search:, chrome-devtools:, and chrome-internal: pages 284 // chrome:, chrome-search:, chrome-devtools:, chrome-distiller: and
285 // should not be accessible by normal content, and should also be unable to 285 // chrome-internal: pages should not be accessible by normal content, and
286 // script anything but themselves (to help limit the damage that a corrupt 286 // should also be unable to script anything but themselves (to help limit the
287 // page could cause). 287 // damage that a corrupt page could cause).
288 WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme)); 288 WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme));
289 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme); 289 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme);
290 290
291 WebString chrome_search_scheme(ASCIIToUTF16(chrome::kChromeSearchScheme)); 291 WebString chrome_search_scheme(ASCIIToUTF16(chrome::kChromeSearchScheme));
292 // The Instant process can only display the content but not read it. Other 292 // The Instant process can only display the content but not read it. Other
293 // processes can't display it or read it. 293 // processes can't display it or read it.
294 if (!command_line->HasSwitch(switches::kInstantProcess)) 294 if (!command_line->HasSwitch(switches::kInstantProcess))
295 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_search_scheme); 295 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_search_scheme);
296 296
297 WebString dev_tools_scheme(ASCIIToUTF16(chrome::kChromeDevToolsScheme)); 297 WebString dev_tools_scheme(ASCIIToUTF16(chrome::kChromeDevToolsScheme));
298 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dev_tools_scheme); 298 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dev_tools_scheme);
299 299
300 WebString internal_scheme(ASCIIToUTF16(chrome::kChromeInternalScheme)); 300 WebString internal_scheme(ASCIIToUTF16(chrome::kChromeInternalScheme));
301 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(internal_scheme); 301 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(internal_scheme);
302 302
303 if (CommandLine::ForCurrentProcess()->HasSwitch(
304 switches::kEnableDomDistiller)) {
305 WebString dom_distiller_scheme(ASCIIToUTF16(chrome::kDomDistillerScheme));
306 // TODO(nyquist): Add test to ensure this happens when the flag is set.
307 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dom_distiller_scheme);
308 }
309
303 #if defined(OS_CHROMEOS) 310 #if defined(OS_CHROMEOS)
304 WebString drive_scheme(ASCIIToUTF16(chrome::kDriveScheme)); 311 WebString drive_scheme(ASCIIToUTF16(chrome::kDriveScheme));
305 WebSecurityPolicy::registerURLSchemeAsLocal(drive_scheme); 312 WebSecurityPolicy::registerURLSchemeAsLocal(drive_scheme);
306 #endif 313 #endif
307 314
308 // chrome: and chrome-search: pages should not be accessible by bookmarklets 315 // chrome: and chrome-search: pages should not be accessible by bookmarklets
309 // or javascript: URLs typed in the omnibox. 316 // or javascript: URLs typed in the omnibox.
310 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( 317 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(
311 chrome_ui_scheme); 318 chrome_ui_scheme);
312 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( 319 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1364 CommandLine* command_line = CommandLine::ForCurrentProcess(); 1371 CommandLine* command_line = CommandLine::ForCurrentProcess();
1365 return !command_line->HasSwitch(switches::kExtensionProcess); 1372 return !command_line->HasSwitch(switches::kExtensionProcess);
1366 } 1373 }
1367 1374
1368 blink::WebWorkerPermissionClientProxy* 1375 blink::WebWorkerPermissionClientProxy*
1369 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( 1376 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
1370 content::RenderView* render_view, 1377 content::RenderView* render_view,
1371 blink::WebFrame* frame) { 1378 blink::WebFrame* frame) {
1372 return new WorkerPermissionClientProxy(render_view, frame); 1379 return new WorkerPermissionClientProxy(render_view, frame);
1373 } 1380 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698