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

Unified Diff: ash/shell.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 | « ash/DEPS ('k') | chrome/browser/component_updater/swiftshader_component_installer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
===================================================================
--- ash/shell.cc (revision 201645)
+++ ash/shell.cc (working copy)
@@ -118,7 +118,7 @@
#include "chromeos/display/output_configurator.h"
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/common/content_switches.h"
-#include "content/public/common/gpu_feature_type.h"
+#include "gpu/config/gpu_feature_type.h"
#endif // defined(OS_CHROMEOS)
namespace ash {
@@ -220,7 +220,7 @@
#if defined(OS_CHROMEOS) && defined(USE_X11)
bool is_panel_fitting_disabled =
content::GpuDataManager::GetInstance()->IsFeatureBlacklisted(
- content::GPU_FEATURE_TYPE_PANEL_FITTING) ||
+ gpu::GPU_FEATURE_TYPE_PANEL_FITTING) ||
CommandLine::ForCurrentProcess()->HasSwitch(
::switches::kDisablePanelFitting);
« no previous file with comments | « ash/DEPS ('k') | chrome/browser/component_updater/swiftshader_component_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698