screenshot disabling policy

chrome/browser/ui/ash/ash_init.cc

Index: chrome/browser/ui/ash/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index e0d400a6d8a84bbac1893ec4bdca1a9128aee894..6b0bd23c4718d3a7275de7aae92ebe80543c710f 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/ui/views/ash/caps_lock_handler.h"
 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/views/ash/key_rewriter.h"
-#include "chrome/browser/ui/views/ash/screenshot_taker.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/env.h"
@@ -68,12 +67,12 @@ void OpenAsh() {
   ash::SetDefaultPersistsAcrossAllWorkspaces(true);
 
   // Shell takes ownership of ChromeShellDelegate.
-  ash::Shell* shell = ash::Shell::CreateInstance(new ChromeShellDelegate);
+  ChromeShellDelegate* delegate = new ChromeShellDelegate;
+  ash::Shell* shell = ash::Shell::CreateInstance(delegate);
   shell->key_rewriter_filter()->SetKeyRewriterDelegate(
       scoped_ptr<ash::KeyRewriterDelegate>(new KeyRewriter).Pass());
-  shell->accelerator_controller()->SetScreenshotDelegate(
-      scoped_ptr<ash::ScreenshotDelegate>(new ScreenshotTaker).Pass());
 #if defined(OS_CHROMEOS)
+  delegate->UpdateScreenshotDelegate();
   shell->accelerator_controller()->SetBrightnessControlDelegate(
       scoped_ptr<ash::BrightnessControlDelegate>(
           new BrightnessController).Pass());