Integrate the new input method API for Views into Chromium.

chrome/browser/chromeos/login/html_page_screen.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/chromeos/login/html_page_screen.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "googleurl/src/gurl.h"
+#include "views/events/event.h"
 #include "views/widget/widget_gtk.h"
 
 namespace chromeos {
 
 static const char kHTMLPageDoneUrl[] = "about:blank";
 
 ///////////////////////////////////////////////////////////////////////////////
 // HTMLPageDomView
 TabContents* HTMLPageDomView::CreateTabContents(Profile* profile,
                                                 SiteInstance* instance) {
@@ skipping 49 matching lines @@
     CloseScreen(ScreenObserver::ACCOUNT_CREATE_BACK);
   }
 }
 
 void HTMLPageScreen::NavigationStateChanged(const TabContents* source,
                                             unsigned changed_flags) {
 }
 
 void HTMLPageScreen::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
   views::Widget* widget = view()->GetWidget();
-  if (widget && event.os_event && !event.skip_in_browser)
-    static_cast<views::WidgetGtk*>(widget)->HandleKeyboardEvent(event.os_event);
+  if (widget && event.os_event && !event.skip_in_browser) {
+    views::KeyEvent views_event(reinterpret_cast<GdkEvent*>(event.os_event));
+    static_cast<views::WidgetGtk*>(widget)->HandleKeyboardEvent(views_event);
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HTMLPageScreen, WebPageDelegate implementation:
 void HTMLPageScreen::OnPageLoaded() {
   StopTimeoutTimer();
   // Enable input methods (e.g. Chinese, Japanese) so that users could input
   // their first and last names.
   if (g_browser_process) {
     const std::string locale = g_browser_process->GetApplicationLocale();
@@ skipping 24 matching lines @@
   // password.
   if (g_browser_process) {
     const std::string locale = g_browser_process->GetApplicationLocale();
     input_method::EnableInputMethods(
         locale, input_method::kKeyboardLayoutsOnly, "");
   }
   delegate()->GetObserver(this)->OnExit(code);
 }
 
 }  // namespace chromeos