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

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

Issue 2208613002: Remove MOJO_SHELL_CLIENT define. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot merge Created 4 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
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 1624 matching lines...) Expand 10 before | Expand all | Expand 10 after
1635 #if defined(USE_OZONE) 1635 #if defined(USE_OZONE)
1636 switches::kOzonePlatform, 1636 switches::kOzonePlatform,
1637 #endif 1637 #endif
1638 #if defined(OS_CHROMEOS) 1638 #if defined(OS_CHROMEOS)
1639 switches::kDisableVaapiAcceleratedVideoEncode, 1639 switches::kDisableVaapiAcceleratedVideoEncode,
1640 #endif 1640 #endif
1641 #if defined(ENABLE_IPC_FUZZER) 1641 #if defined(ENABLE_IPC_FUZZER)
1642 switches::kIpcDumpDirectory, 1642 switches::kIpcDumpDirectory,
1643 switches::kIpcFuzzerTestcase, 1643 switches::kIpcFuzzerTestcase,
1644 #endif 1644 #endif
1645 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
1646 switches::kUseMusInRenderer, 1645 switches::kUseMusInRenderer,
1647 #endif
1648 }; 1646 };
1649 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1647 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1650 arraysize(kSwitchNames)); 1648 arraysize(kSwitchNames));
1651 1649
1652 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd); 1650 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd);
1653 1651
1654 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1652 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1655 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) { 1653 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) {
1656 // Pass kTraceStartup switch to renderer only if startup tracing has not 1654 // Pass kTraceStartup switch to renderer only if startup tracing has not
1657 // finished. 1655 // finished.
(...skipping 1174 matching lines...) Expand 10 before | Expand all | Expand 10 after
2832 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; 2830 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error;
2833 2831
2834 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. Alias 2832 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. Alias
2835 // enough information here so that we can determine what the bad message was. 2833 // enough information here so that we can determine what the bad message was.
2836 base::debug::Alias(&error); 2834 base::debug::Alias(&error);
2837 bad_message::ReceivedBadMessage(process.get(), 2835 bad_message::ReceivedBadMessage(process.get(),
2838 bad_message::RPH_MOJO_PROCESS_ERROR); 2836 bad_message::RPH_MOJO_PROCESS_ERROR);
2839 } 2837 }
2840 2838
2841 } // namespace content 2839 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698