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

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

Issue 1313243002: Remove command line flags and prefs for disabling Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 (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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 374
375 WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() { 375 WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() {
376 TRACE_EVENT0("browser", "RenderViewHostImpl::GetWebkitPrefs"); 376 TRACE_EVENT0("browser", "RenderViewHostImpl::GetWebkitPrefs");
377 WebPreferences prefs; 377 WebPreferences prefs;
378 378
379 const base::CommandLine& command_line = 379 const base::CommandLine& command_line =
380 *base::CommandLine::ForCurrentProcess(); 380 *base::CommandLine::ForCurrentProcess();
381 381
382 prefs.web_security_enabled = 382 prefs.web_security_enabled =
383 !command_line.HasSwitch(switches::kDisableWebSecurity); 383 !command_line.HasSwitch(switches::kDisableWebSecurity);
384 prefs.java_enabled =
385 !command_line.HasSwitch(switches::kDisableJava);
386 384
387 prefs.remote_fonts_enabled = 385 prefs.remote_fonts_enabled =
388 !command_line.HasSwitch(switches::kDisableRemoteFonts); 386 !command_line.HasSwitch(switches::kDisableRemoteFonts);
389 prefs.application_cache_enabled = true; 387 prefs.application_cache_enabled = true;
390 prefs.xss_auditor_enabled = 388 prefs.xss_auditor_enabled =
391 !command_line.HasSwitch(switches::kDisableXSSAuditor); 389 !command_line.HasSwitch(switches::kDisableXSSAuditor);
392 prefs.local_storage_enabled = 390 prefs.local_storage_enabled =
393 !command_line.HasSwitch(switches::kDisableLocalStorage); 391 !command_line.HasSwitch(switches::kDisableLocalStorage);
394 prefs.databases_enabled = 392 prefs.databases_enabled =
395 !command_line.HasSwitch(switches::kDisableDatabases); 393 !command_line.HasSwitch(switches::kDisableDatabases);
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1429 if (!policy->CanReadFile(GetProcess()->GetID(), file)) 1427 if (!policy->CanReadFile(GetProcess()->GetID(), file))
1430 policy->GrantReadFile(GetProcess()->GetID(), file); 1428 policy->GrantReadFile(GetProcess()->GetID(), file);
1431 } 1429 }
1432 } 1430 }
1433 1431
1434 void RenderViewHostImpl::SelectWordAroundCaret() { 1432 void RenderViewHostImpl::SelectWordAroundCaret() {
1435 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1433 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1436 } 1434 }
1437 1435
1438 } // namespace content 1436 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698