| OLD | NEW |
| 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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 chrome::VersionInfo version_info; | 384 chrome::VersionInfo version_info; |
| 385 std::string product("Chrome/"); | 385 std::string product("Chrome/"); |
| 386 product += version_info.is_valid() ? version_info.Version() : "0.0.0.0"; | 386 product += version_info.is_valid() ? version_info.Version() : "0.0.0.0"; |
| 387 return product; | 387 return product; |
| 388 } | 388 } |
| 389 | 389 |
| 390 void ChromeContentClient::SetActiveURL(const GURL& url) { | 390 void ChromeContentClient::SetActiveURL(const GURL& url) { |
| 391 child_process_logging::SetActiveURL(url); | 391 child_process_logging::SetActiveURL(url); |
| 392 } | 392 } |
| 393 | 393 |
| 394 void ChromeContentClient::SetGpuInfo(const content::GPUInfo& gpu_info) { | 394 void ChromeContentClient::SetGpuInfo(const gpu::GPUInfo& gpu_info) { |
| 395 child_process_logging::SetGpuInfo(gpu_info); | 395 child_process_logging::SetGpuInfo(gpu_info); |
| 396 } | 396 } |
| 397 | 397 |
| 398 void ChromeContentClient::AddPepperPlugins( | 398 void ChromeContentClient::AddPepperPlugins( |
| 399 std::vector<content::PepperPluginInfo>* plugins) { | 399 std::vector<content::PepperPluginInfo>* plugins) { |
| 400 ComputeBuiltInPlugins(plugins); | 400 ComputeBuiltInPlugins(plugins); |
| 401 AddPepperFlashFromCommandLine(plugins); | 401 AddPepperFlashFromCommandLine(plugins); |
| 402 | 402 |
| 403 content::PepperPluginInfo plugin; | 403 content::PepperPluginInfo plugin; |
| 404 if (GetBundledPepperFlash(&plugin)) | 404 if (GetBundledPepperFlash(&plugin)) |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 } | 490 } |
| 491 return false; | 491 return false; |
| 492 } | 492 } |
| 493 | 493 |
| 494 std::string ChromeContentClient::GetCarbonInterposePath() const { | 494 std::string ChromeContentClient::GetCarbonInterposePath() const { |
| 495 return std::string(kInterposeLibraryPath); | 495 return std::string(kInterposeLibraryPath); |
| 496 } | 496 } |
| 497 #endif | 497 #endif |
| 498 | 498 |
| 499 } // namespace chrome | 499 } // namespace chrome |
| OLD | NEW |