Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 6c26a09932f17f8858fe8de9f405f693e28810ef..b527b0a1371a57ff90d7fe35564615e23ba3335d 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -100,6 +100,8 @@ |
#include "ash/display/output_configurator_animation.h" |
#include "base/message_pump_aurax11.h" |
#include "chromeos/display/output_configurator.h" |
+#include "content/public/common/content_switches.h" |
+#include "content/public/browser/gpu_data_manager.h" |
#endif // defined(OS_CHROMEOS) |
namespace ash { |
@@ -193,6 +195,13 @@ Shell::Shell(ShellDelegate* delegate) |
gfx::Screen::SetInstance(screen_); |
ui_controls::InstallUIControlsAura(internal::CreateUIControls()); |
#if defined(OS_CHROMEOS) |
+ bool is_panel_fitting_disabled = |
+ (content::GpuDataManager::GetInstance()->GetBlacklistedFeatures() & |
cwolfe
2012/09/18 13:27:47
I'd find this clearer if (as elsewhere in the code
ynovikov
2012/09/21 18:48:27
Done.
|
+ content::GPU_FEATURE_TYPE_PANEL_FITTING) || |
+ CommandLine::ForCurrentProcess()->HasSwitch( |
+ ::switches::kDisablePanelFitting); |
+ output_configurator_->Init(!is_panel_fitting_disabled); |
+ |
output_configurator_->AddObserver(output_configurator_animation_.get()); |
base::MessagePumpAuraX11::Current()->AddDispatcherForRootWindow( |
output_configurator()); |