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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 1008673002: Re-enabling --disable-xss-auditor flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed merge conflicts Created 5 years, 9 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
« no previous file with comments | « no previous file | content/public/common/content_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 *base::CommandLine::ForCurrentProcess(); 341 *base::CommandLine::ForCurrentProcess();
342 342
343 prefs.web_security_enabled = 343 prefs.web_security_enabled =
344 !command_line.HasSwitch(switches::kDisableWebSecurity); 344 !command_line.HasSwitch(switches::kDisableWebSecurity);
345 prefs.java_enabled = 345 prefs.java_enabled =
346 !command_line.HasSwitch(switches::kDisableJava); 346 !command_line.HasSwitch(switches::kDisableJava);
347 347
348 prefs.remote_fonts_enabled = 348 prefs.remote_fonts_enabled =
349 !command_line.HasSwitch(switches::kDisableRemoteFonts); 349 !command_line.HasSwitch(switches::kDisableRemoteFonts);
350 prefs.application_cache_enabled = true; 350 prefs.application_cache_enabled = true;
351 351 prefs.xss_auditor_enabled =
352 !command_line.HasSwitch(switches::kDisableXSSAuditor);
352 prefs.local_storage_enabled = 353 prefs.local_storage_enabled =
353 !command_line.HasSwitch(switches::kDisableLocalStorage); 354 !command_line.HasSwitch(switches::kDisableLocalStorage);
354 prefs.databases_enabled = 355 prefs.databases_enabled =
355 !command_line.HasSwitch(switches::kDisableDatabases); 356 !command_line.HasSwitch(switches::kDisableDatabases);
356 #if defined(OS_ANDROID) 357 #if defined(OS_ANDROID)
357 // WebAudio is enabled by default on x86 and ARM. 358 // WebAudio is enabled by default on x86 and ARM.
358 prefs.webaudio_enabled = 359 prefs.webaudio_enabled =
359 !command_line.HasSwitch(switches::kDisableWebAudio); 360 !command_line.HasSwitch(switches::kDisableWebAudio);
360 #endif 361 #endif
361 362
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 FrameTree* frame_tree = delegate_->GetFrameTree(); 1417 FrameTree* frame_tree = delegate_->GetFrameTree();
1417 1418
1418 frame_tree->ResetForMainFrameSwap(); 1419 frame_tree->ResetForMainFrameSwap();
1419 } 1420 }
1420 1421
1421 void RenderViewHostImpl::SelectWordAroundCaret() { 1422 void RenderViewHostImpl::SelectWordAroundCaret() {
1422 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1423 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1423 } 1424 }
1424 1425
1425 } // namespace content 1426 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698