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

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

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments Created 8 years, 3 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 // 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 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 switches::kForceDeviceScaleFactor, 797 switches::kForceDeviceScaleFactor,
798 switches::kFullMemoryCrashReport, 798 switches::kFullMemoryCrashReport,
799 #if !defined (GOOGLE_CHROME_BUILD) 799 #if !defined (GOOGLE_CHROME_BUILD)
800 // These are unsupported and not fully tested modes, so don't enable them 800 // These are unsupported and not fully tested modes, so don't enable them
801 // for official Google Chrome builds. 801 // for official Google Chrome builds.
802 switches::kInProcessPlugins, 802 switches::kInProcessPlugins,
803 #endif // GOOGLE_CHROME_BUILD 803 #endif // GOOGLE_CHROME_BUILD
804 switches::kInProcessWebGL, 804 switches::kInProcessWebGL,
805 switches::kJavaScriptFlags, 805 switches::kJavaScriptFlags,
806 switches::kLoggingLevel, 806 switches::kLoggingLevel,
807 switches::kOldCheckboxStyle,
808 #if defined(OS_ANDROID) 807 #if defined(OS_ANDROID)
808 switches::kMediaPlayerInRenderProcess,
809 switches::kNetworkCountryIso, 809 switches::kNetworkCountryIso,
810 #endif 810 #endif
811 switches::kNoReferrers, 811 switches::kNoReferrers,
812 switches::kNoSandbox, 812 switches::kNoSandbox,
813 switches::kOldCheckboxStyle,
813 switches::kPpapiOutOfProcess, 814 switches::kPpapiOutOfProcess,
814 switches::kRegisterPepperPlugins, 815 switches::kRegisterPepperPlugins,
815 switches::kRendererAssertTest, 816 switches::kRendererAssertTest,
816 #if defined(OS_POSIX) 817 #if defined(OS_POSIX)
817 switches::kChildCleanExit, 818 switches::kChildCleanExit,
818 #endif 819 #endif
819 switches::kRendererStartupDialog, 820 switches::kRendererStartupDialog,
820 switches::kShowPaintRects, 821 switches::kShowPaintRects,
821 switches::kTestSandbox, 822 switches::kTestSandbox,
822 switches::kTraceStartup, 823 switches::kTraceStartup,
823 // This flag needs to be propagated to the renderer process for 824 // This flag needs to be propagated to the renderer process for
824 // --in-process-webgl. 825 // --in-process-webgl.
825 switches::kUseGL, 826 switches::kUseGL,
826 switches::kUserAgent, 827 switches::kUserAgent,
827 switches::kV, 828 switches::kV,
828 switches::kVideoThreads, 829 switches::kVideoThreads,
829 switches::kVModule, 830 switches::kVModule,
830 switches::kWebCoreLogChannels, 831 switches::kWebCoreLogChannels,
831 }; 832 };
832 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 833 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
833 arraysize(kSwitchNames)); 834 arraysize(kSwitchNames));
834 835
835 // Disable databases in incognito mode. 836 // Disable databases in incognito mode.
836 if (GetBrowserContext()->IsOffTheRecord() && 837 if (GetBrowserContext()->IsOffTheRecord() &&
837 !browser_cmd.HasSwitch(switches::kDisableDatabases)) { 838 !browser_cmd.HasSwitch(switches::kDisableDatabases)) {
838 renderer_cmd->AppendSwitch(switches::kDisableDatabases); 839 renderer_cmd->AppendSwitch(switches::kDisableDatabases);
840 #if defined(OS_ANDROID)
841 renderer_cmd->AppendSwitch(switches::kDisableMediaHistoryLogging);
842 #endif
839 } 843 }
840 } 844 }
841 845
842 base::ProcessHandle RenderProcessHostImpl::GetHandle() { 846 base::ProcessHandle RenderProcessHostImpl::GetHandle() {
843 if (run_renderer_in_process()) 847 if (run_renderer_in_process())
844 return base::Process::Current().handle(); 848 return base::Process::Current().handle();
845 849
846 if (!child_process_launcher_.get() || child_process_launcher_->IsStarting()) 850 if (!child_process_launcher_.get() || child_process_launcher_->IsStarting())
847 return base::kNullProcessHandle; 851 return base::kNullProcessHandle;
848 852
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
1519 int32 route_id, 1523 int32 route_id,
1520 int32 gpu_process_host_id) { 1524 int32 gpu_process_host_id) {
1521 TRACE_EVENT0("renderer_host", 1525 TRACE_EVENT0("renderer_host",
1522 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); 1526 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
1523 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, 1527 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
1524 gpu_process_host_id, 1528 gpu_process_host_id,
1525 0); 1529 0);
1526 } 1530 }
1527 1531
1528 } // namespace content 1532 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698