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

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 645203002: Block NPAPI plugins by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move UMA outside ifdef 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 | « content/public/common/content_switches.cc ('k') | content/test/fake_plugin_service.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/shell/app/shell_main_delegate.h" 5 #include "content/shell/app/shell_main_delegate.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); 184 command_line.AppendSwitch(switches::kDisableDelegatedRenderer);
185 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); 185 command_line.AppendSwitch(cc::switches::kCompositeToMailbox);
186 186
187 command_line.AppendSwitch(switches::kEnableFileCookies); 187 command_line.AppendSwitch(switches::kEnableFileCookies);
188 188
189 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); 189 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo);
190 190
191 command_line.AppendSwitchASCII(switches::kHostResolverRules, 191 command_line.AppendSwitchASCII(switches::kHostResolverRules,
192 "MAP *.test 127.0.0.1"); 192 "MAP *.test 127.0.0.1");
193 193
194 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone.
195 command_line.AppendSwitch(switches::kEnableNpapi);
196
194 // Unless/until WebM files are added to the media layout tests, we need to 197 // Unless/until WebM files are added to the media layout tests, we need to
195 // avoid removing MP4/H264/AAC so that layout tests can run on Android. 198 // avoid removing MP4/H264/AAC so that layout tests can run on Android.
196 #if !defined(OS_ANDROID) 199 #if !defined(OS_ANDROID)
197 net::RemoveProprietaryMediaTypesAndCodecsForTests(); 200 net::RemoveProprietaryMediaTypesAndCodecsForTests();
198 #endif 201 #endif
199 202
200 if (!BlinkTestPlatformInitialize()) { 203 if (!BlinkTestPlatformInitialize()) {
201 if (exit_code) 204 if (exit_code)
202 *exit_code = 1; 205 *exit_code = 1;
203 return true; 206 return true;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 329 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
327 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( 330 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch(
328 switches::kDumpRenderTree) 331 switches::kDumpRenderTree)
329 ? new LayoutTestContentRendererClient 332 ? new LayoutTestContentRendererClient
330 : new ShellContentRendererClient); 333 : new ShellContentRendererClient);
331 334
332 return renderer_client_.get(); 335 return renderer_client_.get();
333 } 336 }
334 337
335 } // namespace content 338 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/test/fake_plugin_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698