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

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

Issue 2037533002: mus: Make --use-mus-in-renderer work again. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 1542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1553 switches::kEnableWin7WebRtcHWH264Decoding, 1553 switches::kEnableWin7WebRtcHWH264Decoding,
1554 switches::kTrySupportedChannelLayouts, 1554 switches::kTrySupportedChannelLayouts,
1555 switches::kTraceExportEventsToETW, 1555 switches::kTraceExportEventsToETW,
1556 #endif 1556 #endif
1557 #if defined(USE_OZONE) 1557 #if defined(USE_OZONE)
1558 switches::kOzonePlatform, 1558 switches::kOzonePlatform,
1559 #endif 1559 #endif
1560 #if defined(OS_CHROMEOS) 1560 #if defined(OS_CHROMEOS)
1561 switches::kDisableVaapiAcceleratedVideoEncode, 1561 switches::kDisableVaapiAcceleratedVideoEncode,
1562 #endif 1562 #endif
1563 #if defined(MOJO_SHELL_CLIENT)
1564 switches::kUseMusInRenderer,
1565 #endif
1563 }; 1566 };
1564 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1567 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1565 arraysize(kSwitchNames)); 1568 arraysize(kSwitchNames));
1566 1569
1567 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd); 1570 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd);
1568 1571
1569 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1572 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1570 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) { 1573 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) {
1571 // Pass kTraceStartup switch to renderer only if startup tracing has not 1574 // Pass kTraceStartup switch to renderer only if startup tracing has not
1572 // finished. 1575 // finished.
(...skipping 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after
2781 2784
2782 // Skip widgets in other processes. 2785 // Skip widgets in other processes.
2783 if (rvh->GetProcess()->GetID() != GetID()) 2786 if (rvh->GetProcess()->GetID() != GetID())
2784 continue; 2787 continue;
2785 2788
2786 rvh->OnWebkitPreferencesChanged(); 2789 rvh->OnWebkitPreferencesChanged();
2787 } 2790 }
2788 } 2791 }
2789 2792
2790 } // namespace content 2793 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698