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

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: reorder initializers for clang Created 6 years, 2 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/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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); 178 command_line.AppendSwitch(cc::switches::kCompositeToMailbox);
179 #endif 179 #endif
180 180
181 command_line.AppendSwitch(switches::kEnableFileCookies); 181 command_line.AppendSwitch(switches::kEnableFileCookies);
182 182
183 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); 183 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo);
184 184
185 command_line.AppendSwitchASCII(switches::kHostResolverRules, 185 command_line.AppendSwitchASCII(switches::kHostResolverRules,
186 "MAP *.test 127.0.0.1"); 186 "MAP *.test 127.0.0.1");
187 187
188 #if defined(OS_WIN) || defined(OS_MACOSX)
189 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone.
190 command_line.AppendSwitch(switches::kEnableNpapi);
191 #endif
192
188 // Unless/until WebM files are added to the media layout tests, we need to 193 // Unless/until WebM files are added to the media layout tests, we need to
189 // avoid removing MP4/H264/AAC so that layout tests can run on Android. 194 // avoid removing MP4/H264/AAC so that layout tests can run on Android.
190 #if !defined(OS_ANDROID) 195 #if !defined(OS_ANDROID)
191 net::RemoveProprietaryMediaTypesAndCodecsForTests(); 196 net::RemoveProprietaryMediaTypesAndCodecsForTests();
192 #endif 197 #endif
193 198
194 if (!BlinkTestPlatformInitialize()) { 199 if (!BlinkTestPlatformInitialize()) {
195 if (exit_code) 200 if (exit_code)
196 *exit_code = 1; 201 *exit_code = 1;
197 return true; 202 return true;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 325 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
321 renderer_client_.reset( 326 renderer_client_.reset(
322 CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree) ? 327 CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree) ?
323 new LayoutTestContentRendererClient : 328 new LayoutTestContentRendererClient :
324 new ShellContentRendererClient); 329 new ShellContentRendererClient);
325 330
326 return renderer_client_.get(); 331 return renderer_client_.get();
327 } 332 }
328 333
329 } // namespace content 334 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698