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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 1271523003: Remove remoting client plugin from chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android and GN build 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 | « chrome/app/BUILD.gn ('k') | chrome/chrome.gyp » ('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 (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 "chrome/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 #if defined(OS_MACOSX) || defined(OS_WIN) 110 #if defined(OS_MACOSX) || defined(OS_WIN)
111 #include "chrome/browser/policy/policy_path_parser.h" 111 #include "chrome/browser/policy/policy_path_parser.h"
112 #endif 112 #endif
113 113
114 #if !defined(DISABLE_NACL) 114 #if !defined(DISABLE_NACL)
115 #include "components/nacl/common/nacl_switches.h" 115 #include "components/nacl/common/nacl_switches.h"
116 #include "components/nacl/renderer/plugin/ppapi_entrypoints.h" 116 #include "components/nacl/renderer/plugin/ppapi_entrypoints.h"
117 #endif 117 #endif
118 118
119 #if defined(ENABLE_REMOTING)
120 #include "remoting/client/plugin/pepper_entrypoints.h"
121 #endif
122
123 #if defined(ENABLE_PLUGINS) && (defined(CHROME_MULTIPLE_DLL_CHILD) || \ 119 #if defined(ENABLE_PLUGINS) && (defined(CHROME_MULTIPLE_DLL_CHILD) || \
124 !defined(CHROME_MULTIPLE_DLL_BROWSER)) 120 !defined(CHROME_MULTIPLE_DLL_BROWSER))
125 #include "pdf/pdf.h" 121 #include "pdf/pdf.h"
126 #endif 122 #endif
127 123
128 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) 124 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
129 #include "chrome/child/pdf_child_init.h" 125 #include "chrome/child/pdf_child_init.h"
130 126
131 base::LazyInstance<ChromeContentRendererClient> 127 base::LazyInstance<ChromeContentRendererClient>
132 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; 128 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 // Note: If you are adding a new process type below, be sure to adjust the 807 // Note: If you are adding a new process type below, be sure to adjust the
812 // AdjustLinuxOOMScore function too. 808 // AdjustLinuxOOMScore function too.
813 #if defined(OS_LINUX) 809 #if defined(OS_LINUX)
814 AdjustLinuxOOMScore(process_type); 810 AdjustLinuxOOMScore(process_type);
815 #endif 811 #endif
816 #if defined(OS_WIN) 812 #if defined(OS_WIN)
817 SuppressWindowsErrorDialogs(); 813 SuppressWindowsErrorDialogs();
818 #endif 814 #endif
819 815
820 #if defined(CHROME_MULTIPLE_DLL_CHILD) || !defined(CHROME_MULTIPLE_DLL_BROWSER) 816 #if defined(CHROME_MULTIPLE_DLL_CHILD) || !defined(CHROME_MULTIPLE_DLL_BROWSER)
821 #if defined(ENABLE_REMOTING)
822 ChromeContentClient::SetRemotingEntryFunctions(
823 remoting::PPP_GetInterface,
824 remoting::PPP_InitializeModule,
825 remoting::PPP_ShutdownModule);
826 #endif
827 #if !defined(DISABLE_NACL) 817 #if !defined(DISABLE_NACL)
828 ChromeContentClient::SetNaClEntryFunctions( 818 ChromeContentClient::SetNaClEntryFunctions(
829 nacl_plugin::PPP_GetInterface, 819 nacl_plugin::PPP_GetInterface,
830 nacl_plugin::PPP_InitializeModule, 820 nacl_plugin::PPP_InitializeModule,
831 nacl_plugin::PPP_ShutdownModule); 821 nacl_plugin::PPP_ShutdownModule);
832 #endif 822 #endif
833 #if defined(ENABLE_PLUGINS) 823 #if defined(ENABLE_PLUGINS)
834 ChromeContentClient::SetPDFEntryFunctions( 824 ChromeContentClient::SetPDFEntryFunctions(
835 chrome_pdf::PPP_GetInterface, 825 chrome_pdf::PPP_GetInterface,
836 chrome_pdf::PPP_InitializeModule, 826 chrome_pdf::PPP_InitializeModule,
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
985 case version_info::Channel::CANARY: 975 case version_info::Channel::CANARY:
986 return true; 976 return true;
987 case version_info::Channel::DEV: 977 case version_info::Channel::DEV:
988 case version_info::Channel::BETA: 978 case version_info::Channel::BETA:
989 case version_info::Channel::STABLE: 979 case version_info::Channel::STABLE:
990 default: 980 default:
991 // Don't enable instrumentation. 981 // Don't enable instrumentation.
992 return false; 982 return false;
993 } 983 }
994 } 984 }
OLDNEW
« no previous file with comments | « chrome/app/BUILD.gn ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698