diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 22:15:21 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 22:15:21 +0000 |
| commit | 740c04eddfcbfe7013657fd461c1e2007bade1d9 (patch) | |
| tree | 6bf04e89bfa9bdf76abf40d7720589581183bde2 /chrome/common/chrome_content_client.cc | |
| parent | 2e0a0918ec930b38d173f3c5e24128596093ed64 (diff) | |
| download | chromium_src-740c04eddfcbfe7013657fd461c1e2007bade1d9.zip chromium_src-740c04eddfcbfe7013657fd461c1e2007bade1d9.tar.gz chromium_src-740c04eddfcbfe7013657fd461c1e2007bade1d9.tar.bz2 | |
Move the Remoting v2 app whitelist into the InternalExtensionProvider.
BUG=252878, 276739
Review URL: https://codereview.chromium.org/24845002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_content_client.cc')
| -rw-r--r-- | chrome/common/chrome_content_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 70aedeb..647aee8 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -302,7 +302,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) { info.is_out_of_process = true; info.name = kRemotingViewerPluginName; info.description = kRemotingViewerPluginDescription; - info.path = base::FilePath( + info.path = base::FilePath::FromUTF8Unsafe( chrome::ChromeContentClient::kRemotingViewerPluginPath); content::WebPluginMimeType remoting_mime_type( kRemotingViewerPluginMimeType, |