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

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

Issue 19381007: Remove unused includes of plugin_list.h. Also remove unused ContentClient and webkit_support method… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_content_client_ios.mm » ('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/cpu.h" 8 #include "base/cpu.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 16 matching lines...) Expand all
27 #include "content/public/common/pepper_plugin_info.h" 27 #include "content/public/common/pepper_plugin_info.h"
28 #include "content/public/common/url_constants.h" 28 #include "content/public/common/url_constants.h"
29 #include "extensions/common/constants.h" 29 #include "extensions/common/constants.h"
30 #include "grit/common_resources.h" 30 #include "grit/common_resources.h"
31 #include "ppapi/shared_impl/ppapi_permissions.h" 31 #include "ppapi/shared_impl/ppapi_permissions.h"
32 #include "remoting/client/plugin/pepper_entrypoints.h" 32 #include "remoting/client/plugin/pepper_entrypoints.h"
33 #include "ui/base/l10n/l10n_util.h" 33 #include "ui/base/l10n/l10n_util.h"
34 #include "ui/base/layout.h" 34 #include "ui/base/layout.h"
35 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 #include "webkit/common/user_agent/user_agent_util.h" 36 #include "webkit/common/user_agent/user_agent_util.h"
37 #include "webkit/plugins/npapi/plugin_list.h"
38 #include "webkit/plugins/plugin_constants.h" 37 #include "webkit/plugins/plugin_constants.h"
39 #include "webkit/plugins/plugin_switches.h" 38 #include "webkit/plugins/plugin_switches.h"
40 39
41 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. 40 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR.
42 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 41 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
43 42
44 #if defined(OS_WIN) 43 #if defined(OS_WIN)
45 #include "base/win/registry.h" 44 #include "base/win/registry.h"
46 #include "base/win/windows_version.h" 45 #include "base/win/windows_version.h"
47 #include "sandbox/win/src/sandbox.h" 46 #include "sandbox/win/src/sandbox.h"
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 void ChromeContentClient::AddPepperPlugins( 397 void ChromeContentClient::AddPepperPlugins(
399 std::vector<content::PepperPluginInfo>* plugins) { 398 std::vector<content::PepperPluginInfo>* plugins) {
400 ComputeBuiltInPlugins(plugins); 399 ComputeBuiltInPlugins(plugins);
401 AddPepperFlashFromCommandLine(plugins); 400 AddPepperFlashFromCommandLine(plugins);
402 401
403 content::PepperPluginInfo plugin; 402 content::PepperPluginInfo plugin;
404 if (GetBundledPepperFlash(&plugin)) 403 if (GetBundledPepperFlash(&plugin))
405 plugins->push_back(plugin); 404 plugins->push_back(plugin);
406 } 405 }
407 406
408 void ChromeContentClient::AddNPAPIPlugins(
409 webkit::npapi::PluginList* plugin_list) {
410 }
411
412 void ChromeContentClient::AddAdditionalSchemes( 407 void ChromeContentClient::AddAdditionalSchemes(
413 std::vector<std::string>* standard_schemes, 408 std::vector<std::string>* standard_schemes,
414 std::vector<std::string>* savable_schemes) { 409 std::vector<std::string>* savable_schemes) {
415 standard_schemes->push_back(extensions::kExtensionScheme); 410 standard_schemes->push_back(extensions::kExtensionScheme);
416 savable_schemes->push_back(extensions::kExtensionScheme); 411 savable_schemes->push_back(extensions::kExtensionScheme);
417 standard_schemes->push_back(kExtensionResourceScheme); 412 standard_schemes->push_back(kExtensionResourceScheme);
418 savable_schemes->push_back(kExtensionResourceScheme); 413 savable_schemes->push_back(kExtensionResourceScheme);
419 standard_schemes->push_back(chrome::kChromeSearchScheme); 414 standard_schemes->push_back(chrome::kChromeSearchScheme);
420 savable_schemes->push_back(chrome::kChromeSearchScheme); 415 savable_schemes->push_back(chrome::kChromeSearchScheme);
421 #if defined(OS_CHROMEOS) 416 #if defined(OS_CHROMEOS)
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 } 485 }
491 return false; 486 return false;
492 } 487 }
493 488
494 std::string ChromeContentClient::GetCarbonInterposePath() const { 489 std::string ChromeContentClient::GetCarbonInterposePath() const {
495 return std::string(kInterposeLibraryPath); 490 return std::string(kInterposeLibraryPath);
496 } 491 }
497 #endif 492 #endif
498 493
499 } // namespace chrome 494 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_content_client_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698