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

Unified Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.cc

Issue 10829003: Move the keyboard overlay view to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
Index: chrome/browser/ui/views/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
index 9f5ff2bfb0f7b19eeba64a1f427153b23e3897c7..593abac490a111630889b6e94d8ac3c5a85a4825 100644
--- a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
@@ -34,6 +34,7 @@
#include "ui/aura/window.h"
#if defined(OS_CHROMEOS)
+#include "ash/wm/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"
@@ -42,7 +43,6 @@
#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"
@@ -263,7 +263,10 @@ bool ChromeShellDelegate::RotatePaneFocus(ash::Shell::Direction direction) {
void ChromeShellDelegate::ShowKeyboardOverlay() {
#if defined(OS_CHROMEOS)
Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
- KeyboardOverlayDialogView::ShowDialog(profile, new ChromeWebContentsHandler);
+ std::string url(chrome::kChromeUIKeyboardOverlayURL);
Ben Goodger (Google) 2012/07/25 16:36:51 as a next step, you should think about how to remo
mazda 2012/07/25 17:36:32 Sure. I'll continue to work on it. I added a TODO
+ KeyboardOverlayView::ShowDialog(profile,
+ new ChromeWebContentsHandler,
+ GURL(url));
#endif
}

Powered by Google App Engine
This is Rietveld 408576698