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

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

Issue 10806075: Get the path of the plugin interposing library from the embedder, since they're the ones who bundle… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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') | content/browser/plugin_process_host.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/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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 const char kO3DPluginName[] = "Google Talk Plugin Video Accelerator"; 68 const char kO3DPluginName[] = "Google Talk Plugin Video Accelerator";
69 const char kO3DPluginMimeType[] ="application/vnd.o3d.auto"; 69 const char kO3DPluginMimeType[] ="application/vnd.o3d.auto";
70 const char kO3DPluginExtension[] = ""; 70 const char kO3DPluginExtension[] = "";
71 const char kO3DPluginDescription[] = "O3D MIME"; 71 const char kO3DPluginDescription[] = "O3D MIME";
72 72
73 const char kGTalkPluginName[] = "Google Talk Plugin"; 73 const char kGTalkPluginName[] = "Google Talk Plugin";
74 const char kGTalkPluginMimeType[] ="application/googletalk"; 74 const char kGTalkPluginMimeType[] ="application/googletalk";
75 const char kGTalkPluginExtension[] = ".googletalk"; 75 const char kGTalkPluginExtension[] = ".googletalk";
76 const char kGTalkPluginDescription[] = "Google Talk Plugin"; 76 const char kGTalkPluginDescription[] = "Google Talk Plugin";
77 77
78 const char kInterposeLibraryPath[] =
79 "@executable_path/../../../libplugin_carbon_interpose.dylib";
80
78 #if defined(ENABLE_REMOTING) 81 #if defined(ENABLE_REMOTING)
79 #if defined(GOOGLE_CHROME_BUILD) 82 #if defined(GOOGLE_CHROME_BUILD)
80 const char kRemotingViewerPluginName[] = "Chrome Remote Desktop Viewer"; 83 const char kRemotingViewerPluginName[] = "Chrome Remote Desktop Viewer";
81 #else 84 #else
82 const char kRemotingViewerPluginName[] = "Chromoting Viewer"; 85 const char kRemotingViewerPluginName[] = "Chromoting Viewer";
83 #endif // defined(GOOGLE_CHROME_BUILD) 86 #endif // defined(GOOGLE_CHROME_BUILD)
84 const char kRemotingViewerPluginDescription[] = 87 const char kRemotingViewerPluginDescription[] =
85 "This plugin allows you to securely access other computers that have been " 88 "This plugin allows you to securely access other computers that have been "
86 "shared with you. To use this plugin you must first install the " 89 "shared with you. To use this plugin you must first install the "
87 "<a href=\"https://chrome.google.com/remotedesktop\">" 90 "<a href=\"https://chrome.google.com/remotedesktop\">"
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 bool ChromeContentClient::GetSandboxProfileForSandboxType( 528 bool ChromeContentClient::GetSandboxProfileForSandboxType(
526 int sandbox_type, 529 int sandbox_type,
527 int* sandbox_profile_resource_id) const { 530 int* sandbox_profile_resource_id) const {
528 DCHECK(sandbox_profile_resource_id); 531 DCHECK(sandbox_profile_resource_id);
529 if (sandbox_type == CHROME_SANDBOX_TYPE_NACL_LOADER) { 532 if (sandbox_type == CHROME_SANDBOX_TYPE_NACL_LOADER) {
530 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; 533 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
531 return true; 534 return true;
532 } 535 }
533 return false; 536 return false;
534 } 537 }
538
539 std::string ChromeContentClient::GetCarbonInterposePath() const {
540 return std::string(kInterposeLibraryPath);
541 }
535 #endif 542 #endif
536 543
537 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( 544 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
538 content::PepperPluginInfo* plugin, 545 content::PepperPluginInfo* plugin,
539 bool* override_npapi_flash) { 546 bool* override_npapi_flash) {
540 if (!ConductingPepperFlashFieldTrial()) 547 if (!ConductingPepperFlashFieldTrial())
541 return false; 548 return false;
542 return GetBundledPepperFlash(plugin, override_npapi_flash); 549 return GetBundledPepperFlash(plugin, override_npapi_flash);
543 } 550 }
544 551
545 } // namespace chrome 552 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | content/browser/plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698