OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/string_split.h" | 10 #include "base/string_split.h" |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 plugins->push_back(plugin); | 180 plugins->push_back(plugin); |
181 } | 181 } |
182 | 182 |
183 #endif // !defined(NACL_WIN64) | 183 #endif // !defined(NACL_WIN64) |
184 | 184 |
185 } // namespace | 185 } // namespace |
186 | 186 |
187 namespace chrome { | 187 namespace chrome { |
188 | 188 |
189 const char* ChromeContentClient::kPDFPluginName = ::kPDFPluginName; | 189 const char* ChromeContentClient::kPDFPluginName = ::kPDFPluginName; |
| 190 const char* ChromeContentClient::kNaClPluginName = ::kNaClPluginName; |
190 | 191 |
191 void ChromeContentClient::SetActiveURL(const GURL& url) { | 192 void ChromeContentClient::SetActiveURL(const GURL& url) { |
192 child_process_logging::SetActiveURL(url); | 193 child_process_logging::SetActiveURL(url); |
193 } | 194 } |
194 | 195 |
195 void ChromeContentClient::SetGpuInfo(const GPUInfo& gpu_info) { | 196 void ChromeContentClient::SetGpuInfo(const GPUInfo& gpu_info) { |
196 child_process_logging::SetGpuInfo(gpu_info); | 197 child_process_logging::SetGpuInfo(gpu_info); |
197 } | 198 } |
198 | 199 |
199 void ChromeContentClient::AddPepperPlugins( | 200 void ChromeContentClient::AddPepperPlugins( |
(...skipping 24 matching lines...) Expand all Loading... |
224 switch (msg.type()) { | 225 switch (msg.type()) { |
225 case ViewHostMsg_Snapshot::ID: | 226 case ViewHostMsg_Snapshot::ID: |
226 return true; | 227 return true; |
227 default: | 228 default: |
228 break; | 229 break; |
229 } | 230 } |
230 return false; | 231 return false; |
231 } | 232 } |
232 | 233 |
233 } // namespace chrome | 234 } // namespace chrome |
OLD | NEW |