Moves NewWindowDelegate to ash/common

chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
 
 #include <stddef.h>
 
-#include "ash/new_window_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/new_window_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/values.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 147 matching lines @@
       "showKeyboardShortcuts",
       base::Bind(&KeyboardHandler::HandleShowKeyboardShortcuts,
                  base::Unretained(this)));
 }
 
 void KeyboardHandler::OnKeyboardDeviceConfigurationChanged() {
   UpdateCapsLockOptions();
 }
 
 void KeyboardHandler::HandleShowKeyboardShortcuts(const base::ListValue* args) {
-  ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay();
+  ash::WmShell::Get()->new_window_delegate()->ShowKeyboardOverlay();
 }
 
 void KeyboardHandler::UpdateCapsLockOptions() const {
   const base::FundamentalValue show_caps_lock_options(HasExternalKeyboard());
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.KeyboardOverlay.showCapsLockOptions", show_caps_lock_options);
 }
 
 }  // namespace options
 }  // namespace chromeos