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

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

Issue 829133009: Remove command line flag --disable-plugins (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased patch Created 5 years, 11 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 | « chromecast/browser/cast_browser_main_parts.cc ('k') | 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 320
321 WebPreferences RenderViewHostImpl::ComputeWebkitPrefs(const GURL& url) { 321 WebPreferences RenderViewHostImpl::ComputeWebkitPrefs(const GURL& url) {
322 TRACE_EVENT0("browser", "RenderViewHostImpl::GetWebkitPrefs"); 322 TRACE_EVENT0("browser", "RenderViewHostImpl::GetWebkitPrefs");
323 WebPreferences prefs; 323 WebPreferences prefs;
324 324
325 const base::CommandLine& command_line = 325 const base::CommandLine& command_line =
326 *base::CommandLine::ForCurrentProcess(); 326 *base::CommandLine::ForCurrentProcess();
327 327
328 prefs.web_security_enabled = 328 prefs.web_security_enabled =
329 !command_line.HasSwitch(switches::kDisableWebSecurity); 329 !command_line.HasSwitch(switches::kDisableWebSecurity);
330 prefs.plugins_enabled =
331 !command_line.HasSwitch(switches::kDisablePlugins);
332 prefs.java_enabled = 330 prefs.java_enabled =
333 !command_line.HasSwitch(switches::kDisableJava); 331 !command_line.HasSwitch(switches::kDisableJava);
334 332
335 prefs.remote_fonts_enabled = 333 prefs.remote_fonts_enabled =
336 !command_line.HasSwitch(switches::kDisableRemoteFonts); 334 !command_line.HasSwitch(switches::kDisableRemoteFonts);
337 335
338 prefs.local_storage_enabled = 336 prefs.local_storage_enabled =
339 !command_line.HasSwitch(switches::kDisableLocalStorage); 337 !command_line.HasSwitch(switches::kDisableLocalStorage);
340 prefs.databases_enabled = 338 prefs.databases_enabled =
341 !command_line.HasSwitch(switches::kDisableDatabases); 339 !command_line.HasSwitch(switches::kDisableDatabases);
(...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after
1484 FrameTree* frame_tree = delegate_->GetFrameTree(); 1482 FrameTree* frame_tree = delegate_->GetFrameTree();
1485 1483
1486 frame_tree->ResetForMainFrameSwap(); 1484 frame_tree->ResetForMainFrameSwap();
1487 } 1485 }
1488 1486
1489 void RenderViewHostImpl::SelectWordAroundCaret() { 1487 void RenderViewHostImpl::SelectWordAroundCaret() {
1490 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1488 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1491 } 1489 }
1492 1490
1493 } // namespace content 1491 } // namespace content
OLDNEW
« no previous file with comments | « chromecast/browser/cast_browser_main_parts.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698