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

Side by Side Diff: content/browser/zygote_host/zygote_host_impl_linux.cc

Issue 10837142: Remove --load-2x-resources flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 4 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 | Annotate | Revision Log
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/zygote_host/zygote_host_impl_linux.h" 5 #include "content/browser/zygote_host/zygote_host_impl_linux.h"
6 6
7 #include <sys/socket.h> 7 #include <sys/socket.h>
8 #include <sys/stat.h> 8 #include <sys/stat.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #include <unistd.h> 10 #include <unistd.h>
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr. 98 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr.
99 switches::kV, 99 switches::kV,
100 switches::kVModule, 100 switches::kVModule,
101 switches::kRegisterPepperPlugins, 101 switches::kRegisterPepperPlugins,
102 switches::kDisableSeccompSandbox, 102 switches::kDisableSeccompSandbox,
103 switches::kDisableSeccompFilterSandbox, 103 switches::kDisableSeccompFilterSandbox,
104 switches::kEnableSeccompSandbox, 104 switches::kEnableSeccompSandbox,
105 // Zygote process needs to know what resources to have loaded when it 105 // Zygote process needs to know what resources to have loaded when it
106 // becomes a renderer process. 106 // becomes a renderer process.
107 switches::kForceDeviceScaleFactor, 107 switches::kForceDeviceScaleFactor,
108 switches::kLoad2xResources,
109 switches::kNoSandbox, 108 switches::kNoSandbox,
110 }; 109 };
111 cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches, 110 cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches,
112 arraysize(kForwardSwitches)); 111 arraysize(kForwardSwitches));
113 112
114 content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( 113 content::GetContentClient()->browser()->AppendExtraCommandLineSwitches(
115 &cmd_line, -1); 114 &cmd_line, -1);
116 115
117 sandbox_binary_ = sandbox_cmd.c_str(); 116 sandbox_binary_ = sandbox_cmd.c_str();
118 117
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 477
479 pid_t ZygoteHostImpl::GetSandboxHelperPid() const { 478 pid_t ZygoteHostImpl::GetSandboxHelperPid() const {
480 return RenderSandboxHostLinux::GetInstance()->pid(); 479 return RenderSandboxHostLinux::GetInstance()->pid();
481 } 480 }
482 481
483 int ZygoteHostImpl::GetSandboxStatus() const { 482 int ZygoteHostImpl::GetSandboxStatus() const {
484 if (have_read_sandbox_status_word_) 483 if (have_read_sandbox_status_word_)
485 return sandbox_status_; 484 return sandbox_status_;
486 return 0; 485 return 0;
487 } 486 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | ui/aura/root_window_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698