Replace PeekMessage for TSF awareness

chrome/browser/chrome_browser_main_win.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/chrome_browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/scoped_native_library.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/metro.h"
+#include "base/win/text_services_message_filter.h"
 #include "base/win/windows_version.h"
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/browser_util_win.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/media_gallery/media_device_notifications_window_win.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/browser/ui/uninstall_browser_prompt.h"
@@ skipping 150 matching lines @@
 
   ChromeBrowserMainParts::PreMainMessageLoopStart();
   if (!parameters().ui_task) {
     // Make sure that we know how to handle exceptions from the message loop.
     InitializeWindowProcExceptions();
   }
   media_device_notifications_window_ =
     new chrome::MediaDeviceNotificationsWindowWin();
 }
 
+void ChromeBrowserMainPartsWin::PostMainMessageLoopStart() {
+  DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
+
+  if (base::win::IsTsfAwareRequired()) {
+    // Create a TSF message filter for the message loop. MessageLoop takes
+    // ownership of the filter.
+    scoped_ptr<base::MessagePumpForUI::MessageFilter> tsf_message_filter(

[rvargas (doing something else), 2012/09/05 21:25:03]

Should not use MessagePumpForUI directly.

[yoichio, 2012/09/06 00:48:33]

Done.

+      new base::win::TextServicesMessageFilter);
+    if (tsf_message_filter->Init()) {
+      MessageLoopForUI::current()->SetMessageFilter(
+        tsf_message_filter.release());
+    }
+  }
+}
+
 // static
 void ChromeBrowserMainPartsWin::PrepareRestartOnCrashEnviroment(
     const CommandLine& parsed_command_line) {
   // Clear this var so child processes don't show the dialog by default.
   scoped_ptr<base::Environment> env(base::Environment::Create());
   env->UnSetVar(env_vars::kShowRestart);
 
   // For non-interactive tests we don't restart on crash.
   if (env->HasVar(env_vars::kHeadless))
     return;
@@ skipping 139 matching lines @@
   if (resource_id)
     return l10n_util::GetStringUTF16(resource_id);
   return string16();
 }
 
 // static
 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
   CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
   installer::SetTranslationDelegate(&delegate);
 }