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

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

Issue 1263643003: Changing command line flag from disable appcontainer to enable appcontainer. As there are some repo… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
Patch Set: Created 5 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
« no previous file with comments | « no previous file | 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 ~RendererSandboxedProcessLauncherDelegate() override {} 335 ~RendererSandboxedProcessLauncherDelegate() override {}
336 336
337 #if defined(OS_WIN) 337 #if defined(OS_WIN)
338 void PreSpawnTarget(sandbox::TargetPolicy* policy, bool* success) override { 338 void PreSpawnTarget(sandbox::TargetPolicy* policy, bool* success) override {
339 AddBaseHandleClosePolicy(policy); 339 AddBaseHandleClosePolicy(policy);
340 340
341 if (base::win::GetVersion() == base::win::VERSION_WIN8 || 341 if (base::win::GetVersion() == base::win::VERSION_WIN8 ||
342 base::win::GetVersion() == base::win::VERSION_WIN8_1) { 342 base::win::GetVersion() == base::win::VERSION_WIN8_1) {
343 const base::CommandLine& command_line = 343 const base::CommandLine& command_line =
344 *base::CommandLine::ForCurrentProcess(); 344 *base::CommandLine::ForCurrentProcess();
345 if (!command_line.HasSwitch(switches::kDisableAppContainer)) { 345 if (command_line.HasSwitch(switches::kEnableAppContainer)) {
346 // TODO(shrikant): Check if these constants should be different across 346 // TODO(shrikant): Check if these constants should be different across
347 // various versions of Chromium code base or could be same. 347 // various versions of Chromium code base or could be same.
348 // If there should be different SID per channel then move this code 348 // If there should be different SID per channel then move this code
349 // in chrome rather than content and assign SID based on 349 // in chrome rather than content and assign SID based on
350 // VersionInfo::GetChannel(). 350 // VersionInfo::GetChannel().
351 const wchar_t kAppContainerSid[] = 351 const wchar_t kAppContainerSid[] =
352 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" 352 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
353 L"924012148-129201922"; 353 L"924012148-129201922";
354 354
355 policy->SetLowBox(kAppContainerSid); 355 policy->SetLowBox(kAppContainerSid);
(...skipping 2111 matching lines...) Expand 10 before | Expand all | Expand 10 after
2467 if (worker_ref_count_ == 0) 2467 if (worker_ref_count_ == 0)
2468 Cleanup(); 2468 Cleanup();
2469 } 2469 }
2470 2470
2471 void RenderProcessHostImpl::GetAudioOutputControllers( 2471 void RenderProcessHostImpl::GetAudioOutputControllers(
2472 const GetAudioOutputControllersCallback& callback) const { 2472 const GetAudioOutputControllersCallback& callback) const {
2473 audio_renderer_host()->GetOutputControllers(callback); 2473 audio_renderer_host()->GetOutputControllers(callback);
2474 } 2474 }
2475 2475
2476 } // namespace content 2476 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698