Revert "Revert 148383 - Move the keyboard overlay view to ash."

chrome/browser/ui/views/ash/chrome_shell_delegate.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/views/ash/chrome_shell_delegate.h"
 
 #include "ash/launcher/launcher_types.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
@@ skipping 16 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/window.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/keyboard_overlay/keyboard_overlay_view.h"
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
-#include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #endif
 
 namespace {
 
 // Returns the browser that should handle accelerators.
@@ skipping 199 matching lines @@
       break;
     case ash::Shell::BACKWARD:
       chrome::FocusPreviousPane(browser);
       break;
   }
   return true;
 }
 
 void ChromeShellDelegate::ShowKeyboardOverlay() {
 #if defined(OS_CHROMEOS)
+  // TODO(mazda): Move the show logic to ash (http://crbug.com/124222).
   Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
-  KeyboardOverlayDialogView::ShowDialog(profile, new ChromeWebContentsHandler);
+  std::string url(chrome::kChromeUIKeyboardOverlayURL);
+  KeyboardOverlayView::ShowDialog(profile,
+                                  new ChromeWebContentsHandler,
+                                  GURL(url));
 #endif
 }
 
 void ChromeShellDelegate::ShowTaskManager() {
   Browser* browser = browser::FindOrCreateTabbedBrowser(
       ProfileManager::GetDefaultProfileOrOffTheRecord());
   chrome::OpenTaskManager(browser, false);
 }
 
 content::BrowserContext* ChromeShellDelegate::GetCurrentBrowserContext() {
@@ skipping 95 matching lines @@
       ash::Shell::GetInstance()->ShowLauncher();
       break;
     default:
       NOTREACHED() << "Unexpected notification " << type;
   }
 #else
   // MSVC++ warns about switch statements without any cases.
   NOTREACHED() << "Unexpected notification " << type;
 #endif
 }