request review: fix issue 2821 and 6132

chrome/views/native_control.cc

 // Copyright (c) 2006-2008 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/views/native_control.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlframe.h>
@@ skipping 322 matching lines @@
   // If the UI for the view is mirrored, we should make sure we add the
   // extended window style for a right-to-left layout so the subclass creates
   // a mirrored HWND for the underlying control.
   DWORD ex_style = 0;
   if (UILayoutIsRightToLeft())
     ex_style |= l10n_util::GetExtendedStyles();
 
   return ex_style;
 }
 
+DWORD NativeControl::GetAdditionalRTLStyle() const {
+  // If the UI for the view is mirrored, we should make sure we add the
+  // extended window style for a right-to-left layout so the subclass creates
+  // a mirrored HWND for the underlying control.
+  DWORD ex_style = 0;
+  if (UILayoutIsRightToLeft())
+    ex_style |= l10n_util::GetExtendedTooltipStyles();
+
+  return ex_style;
+}
+
 // static
 LRESULT CALLBACK NativeControl::NativeControlWndProc(HWND window, UINT message,
                                                      WPARAM w_param,
                                                      LPARAM l_param) {
   HANDLE original_handler = GetProp(window, kHandlerKey);
   DCHECK(original_handler);
   NativeControl* native_control =
       static_cast<NativeControl*>(GetProp(window, kNativeControlKey));
   DCHECK(native_control);
 
   if (message == WM_KEYDOWN) {
     if (native_control->OnKeyDown(static_cast<int>(w_param)))
       return 0;
   } else if (message == WM_DESTROY) {
     win_util::SetWindowProc(window,
                             reinterpret_cast<WNDPROC>(original_handler));
     RemoveProp(window, kHandlerKey);
     RemoveProp(window, kNativeControlKey);
   }
 
   return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window,
                         message, w_param, l_param);
 }
 
 }  // namespace views