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

Unified Diff: chrome/browser/ui/webui/flash_ui.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/metrics/metrics_log.cc ('k') | chrome/common/child_process_logging.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/flash_ui.cc
===================================================================
--- chrome/browser/ui/webui/flash_ui.cc (revision 201645)
+++ chrome/browser/ui/webui/flash_ui.cc (working copy)
@@ -33,7 +33,7 @@
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"
#include "content/public/browser/web_ui_message_handler.h"
-#include "content/public/common/gpu_info.h"
+#include "gpu/config/gpu_info.h"
#include "grit/browser_resources.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -314,7 +314,7 @@
// GPU information.
AddPair(list, string16(), "--- GPU information ---");
- content::GPUInfo gpu_info = GpuDataManager::GetInstance()->GetGPUInfo();
+ gpu::GPUInfo gpu_info = GpuDataManager::GetInstance()->GetGPUInfo();
std::string reason;
if (!GpuDataManager::GetInstance()->GpuAccessAllowed(&reason)) {
@@ -322,8 +322,8 @@
"GPU access is not allowed: " + reason);
}
#if defined(OS_WIN)
- const content::DxDiagNode& node = gpu_info.dx_diagnostics;
- for (std::map<std::string, content::DxDiagNode>::const_iterator it =
+ const gpu::DxDiagNode& node = gpu_info.dx_diagnostics;
+ for (std::map<std::string, gpu::DxDiagNode>::const_iterator it =
node.children.begin();
it != node.children.end();
++it) {
« no previous file with comments | « chrome/browser/metrics/metrics_log.cc ('k') | chrome/common/child_process_logging.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698