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

Unified Diff: chrome/browser/metrics/metrics_log.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gpu/gpu_feature_checker.cc ('k') | chrome/browser/ui/webui/flash_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/metrics/metrics_log.cc
===================================================================
--- chrome/browser/metrics/metrics_log.cc (revision 201645)
+++ chrome/browser/metrics/metrics_log.cc (working copy)
@@ -43,11 +43,11 @@
#include "chrome/installer/util/google_update_settings.h"
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/common/content_client.h"
-#include "content/public/common/gpu_info.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_adapter_factory.h"
#include "device/bluetooth/bluetooth_device.h"
#include "googleurl/src/gurl.h"
+#include "gpu/config/gpu_info.h"
#include "ui/gfx/screen.h"
#include "webkit/plugins/webplugininfo.h"
@@ -785,7 +785,7 @@
{
OPEN_ELEMENT_FOR_SCOPE("gpu");
- const content::GPUInfo& gpu_info =
+ const gpu::GPUInfo& gpu_info =
GpuDataManager::GetInstance()->GetGPUInfo();
// Write the XML version.
@@ -885,7 +885,7 @@
base::android::BuildInfo::GetInstance()->android_build_fp());
#endif
- const content::GPUInfo& gpu_info =
+ const gpu::GPUInfo& gpu_info =
GpuDataManager::GetInstance()->GetGPUInfo();
SystemProfileProto::Hardware::Graphics* gpu = hardware->mutable_gpu();
gpu->set_vendor_id(gpu_info.gpu.vendor_id);
« no previous file with comments | « chrome/browser/gpu/gpu_feature_checker.cc ('k') | chrome/browser/ui/webui/flash_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698