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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 525513003: Cleanup: Put more plugin code behind the ENABLE_PLUGINS ifdef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_split.h" 13 #include "base/strings/string_split.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "chrome/common/child_process_logging.h" 18 #include "chrome/common/child_process_logging.h"
19 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/chrome_version_info.h" 21 #include "chrome/common/chrome_version_info.h"
22 #include "chrome/common/crash_keys.h" 22 #include "chrome/common/crash_keys.h"
23 #include "chrome/common/render_messages.h" 23 #include "chrome/common/render_messages.h"
24 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
25 #include "chrome/grit/common_resources.h" 25 #include "chrome/grit/common_resources.h"
26 #include "components/dom_distiller/core/url_constants.h" 26 #include "components/dom_distiller/core/url_constants.h"
27 #include "content/public/common/content_constants.h" 27 #include "content/public/common/content_constants.h"
28 #include "content/public/common/content_switches.h" 28 #include "content/public/common/content_switches.h"
29 #include "content/public/common/pepper_plugin_info.h"
30 #include "content/public/common/url_constants.h" 29 #include "content/public/common/url_constants.h"
31 #include "content/public/common/user_agent.h" 30 #include "content/public/common/user_agent.h"
32 #include "extensions/common/constants.h" 31 #include "extensions/common/constants.h"
33 #include "gpu/config/gpu_info.h" 32 #include "gpu/config/gpu_info.h"
34 #include "net/http/http_util.h" 33 #include "net/http/http_util.h"
35 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
36 #include "ui/base/layout.h" 35 #include "ui/base/layout.h"
37 #include "ui/base/resource/resource_bundle.h" 36 #include "ui/base/resource/resource_bundle.h"
38 37
39 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 38 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
40 39
41 #if defined(OS_WIN) 40 #if defined(OS_WIN)
42 #include "base/win/registry.h" 41 #include "base/win/registry.h"
43 #include "base/win/windows_version.h" 42 #include "base/win/windows_version.h"
44 #elif defined(OS_MACOSX) 43 #elif defined(OS_MACOSX)
45 #include "components/nacl/common/nacl_sandbox_type_mac.h" 44 #include "components/nacl/common/nacl_sandbox_type_mac.h"
46 #endif 45 #endif
47 46
48 #if !defined(DISABLE_NACL) 47 #if !defined(DISABLE_NACL)
49 #include "components/nacl/common/nacl_constants.h" 48 #include "components/nacl/common/nacl_constants.h"
50 #include "components/nacl/common/nacl_process_type.h" 49 #include "components/nacl/common/nacl_process_type.h"
51 #include "ppapi/native_client/src/trusted/plugin/ppapi_entrypoints.h" 50 #include "ppapi/native_client/src/trusted/plugin/ppapi_entrypoints.h"
52 #endif 51 #endif
53 52
54 #if defined(ENABLE_PLUGINS) 53 #if defined(ENABLE_PLUGINS)
55 #include "chrome/common/pepper_flash.h" 54 #include "chrome/common/pepper_flash.h"
55 #include "content/public/common/pepper_plugin_info.h"
56 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. 56 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR.
57 #include "ppapi/shared_impl/ppapi_permissions.h" 57 #include "ppapi/shared_impl/ppapi_permissions.h"
58 #endif 58 #endif
59 59
60 #if defined(ENABLE_REMOTING) 60 #if defined(ENABLE_REMOTING)
61 #include "remoting/client/plugin/pepper_entrypoints.h" 61 #include "remoting/client/plugin/pepper_entrypoints.h"
62 #endif 62 #endif
63 63
64 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ 64 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
65 !defined(WIDEVINE_CDM_IS_COMPONENT) 65 !defined(WIDEVINE_CDM_IS_COMPONENT)
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 int sandbox_type, 536 int sandbox_type,
537 int* sandbox_profile_resource_id) const { 537 int* sandbox_profile_resource_id) const {
538 DCHECK(sandbox_profile_resource_id); 538 DCHECK(sandbox_profile_resource_id);
539 if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) { 539 if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) {
540 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; 540 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
541 return true; 541 return true;
542 } 542 }
543 return false; 543 return false;
544 } 544 }
545 #endif 545 #endif
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698