| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/shell/common/shell_content_client.h" | 5 #include "extensions/shell/common/shell_content_client.h" |
| 6 | 6 |
| 7 #include "base/strings/string_piece.h" | 7 #include "base/strings/string_piece.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "content/public/common/user_agent.h" | 9 #include "content/public/common/user_agent.h" |
| 10 #include "extensions/common/constants.h" | 10 #include "extensions/common/constants.h" |
| 11 #include "extensions/shell/common/version.h" // Generated file. | 11 #include "extensions/shell/common/version.h" // Generated file. |
| 12 #include "ui/base/l10n/l10n_util.h" | 12 #include "ui/base/l10n/l10n_util.h" |
| 13 #include "ui/base/resource/resource_bundle.h" | 13 #include "ui/base/resource/resource_bundle.h" |
| 14 | 14 |
| 15 #if !defined(DISABLE_NACL) | 15 #if !defined(DISABLE_NACL) |
| 16 #include "base/base_paths.h" | 16 #include "base/base_paths.h" |
| 17 #include "base/files/file_path.h" | 17 #include "base/files/file_path.h" |
| 18 #include "base/path_service.h" | 18 #include "base/path_service.h" |
| 19 #include "components/nacl/common/nacl_constants.h" | 19 #include "components/nacl/common/nacl_constants.h" |
| 20 #include "components/nacl/renderer/plugin/ppapi_entrypoints.h" |
| 20 #include "content/public/common/pepper_plugin_info.h" | 21 #include "content/public/common/pepper_plugin_info.h" |
| 21 #include "ppapi/native_client/src/trusted/plugin/ppapi_entrypoints.h" | |
| 22 #include "ppapi/shared_impl/ppapi_permissions.h" | 22 #include "ppapi/shared_impl/ppapi_permissions.h" |
| 23 #endif | 23 #endif |
| 24 | 24 |
| 25 namespace extensions { | 25 namespace extensions { |
| 26 namespace { | 26 namespace { |
| 27 | 27 |
| 28 #if !defined(DISABLE_NACL) | 28 #if !defined(DISABLE_NACL) |
| 29 bool GetNaClPluginPath(base::FilePath* path) { | 29 bool GetNaClPluginPath(base::FilePath* path) { |
| 30 // On Posix, plugins live in the module directory. | 30 // On Posix, plugins live in the module directory. |
| 31 base::FilePath module; | 31 base::FilePath module; |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes( | 103 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes( |
| 104 int resource_id) const { | 104 int resource_id) const { |
| 105 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id); | 105 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id); |
| 106 } | 106 } |
| 107 | 107 |
| 108 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const { | 108 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const { |
| 109 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); | 109 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); |
| 110 } | 110 } |
| 111 | 111 |
| 112 } // namespace extensions | 112 } // namespace extensions |
| OLD | NEW |