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

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

Issue 15745014: Move GPU device/driver info related code from content to gpu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 7 years, 7 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') | chrome/common/chrome_content_client_ios.mm » ('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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 chrome::VersionInfo version_info; 375 chrome::VersionInfo version_info;
376 std::string product("Chrome/"); 376 std::string product("Chrome/");
377 product += version_info.is_valid() ? version_info.Version() : "0.0.0.0"; 377 product += version_info.is_valid() ? version_info.Version() : "0.0.0.0";
378 return product; 378 return product;
379 } 379 }
380 380
381 void ChromeContentClient::SetActiveURL(const GURL& url) { 381 void ChromeContentClient::SetActiveURL(const GURL& url) {
382 child_process_logging::SetActiveURL(url); 382 child_process_logging::SetActiveURL(url);
383 } 383 }
384 384
385 void ChromeContentClient::SetGpuInfo(const content::GPUInfo& gpu_info) { 385 void ChromeContentClient::SetGpuInfo(const gpu::GPUInfo& gpu_info) {
386 child_process_logging::SetGpuInfo(gpu_info); 386 child_process_logging::SetGpuInfo(gpu_info);
387 } 387 }
388 388
389 void ChromeContentClient::AddPepperPlugins( 389 void ChromeContentClient::AddPepperPlugins(
390 std::vector<content::PepperPluginInfo>* plugins) { 390 std::vector<content::PepperPluginInfo>* plugins) {
391 ComputeBuiltInPlugins(plugins); 391 ComputeBuiltInPlugins(plugins);
392 AddPepperFlashFromCommandLine(plugins); 392 AddPepperFlashFromCommandLine(plugins);
393 393
394 content::PepperPluginInfo plugin; 394 content::PepperPluginInfo plugin;
395 if (GetBundledPepperFlash(&plugin)) 395 if (GetBundledPepperFlash(&plugin))
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 } 481 }
482 return false; 482 return false;
483 } 483 }
484 484
485 std::string ChromeContentClient::GetCarbonInterposePath() const { 485 std::string ChromeContentClient::GetCarbonInterposePath() const {
486 return std::string(kInterposeLibraryPath); 486 return std::string(kInterposeLibraryPath);
487 } 487 }
488 #endif 488 #endif
489 489
490 } // namespace chrome 490 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_content_client_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698