Review Request: fix issue 5724, 5738 -- wrong position of system menu

chrome/views/window/window_win.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/window/window_win.h"
 
 #include <shellapi.h>
 
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 397 matching lines @@
                                 non_client_view_->GetPreferredSize().ToSIZE(),
                                 false);
 }
 
 void WindowWin::RunSystemMenu(const gfx::Point& point) {
   // We need to reset and clean up any currently created system menu objects.
   // We need to call this otherwise there's a small chance that we aren't going
   // to get a system menu. We also can't take the return value of this
   // function. We need to call it *again* to get a valid HMENU.
   //::GetSystemMenu(GetNativeView(), TRUE);
+  UINT flags = TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD;
+  if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
+    flags |= TPM_RIGHTALIGN;
   HMENU system_menu = ::GetSystemMenu(GetNativeView(), FALSE);
-  int id = ::TrackPopupMenu(system_menu,
-                            TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD,
+  int id = ::TrackPopupMenu(system_menu, flags,
                             point.x(), point.y(), 0, GetNativeView(), NULL);
   ExecuteSystemMenuCommand(id);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowWin, WidgetWin overrides:
 
 void WindowWin::OnActivate(UINT action, BOOL minimized, HWND window) {
   if (action == WA_INACTIVE)
     SaveWindowPosition();
@@ skipping 55 matching lines @@
   saved_window_placement.length = sizeof(WINDOWPLACEMENT);
   GetWindowPlacement(GetNativeView(), &saved_window_placement);
   Hide();
 
   // Important step: restore the window first, since our hiding hack doesn't
   // work for maximized windows! We tell the frame not to allow itself to be
   // made visible though, which removes the brief flicker.
   force_hidden_ = true;
   ::ShowWindow(GetNativeView(), SW_RESTORE);
   force_hidden_ = false;
-  
+
   // We respond to this in response to WM_DWMCOMPOSITIONCHANGED since that is
   // the only thing we care about - we don't actually respond to WM_THEMECHANGED
   // messages.
   non_client_view_->SetUseNativeFrame(win_util::ShouldUseVistaFrame());
 
   // Now that we've updated the frame, we'll want to restore our saved placement
   // since the display should have settled down and we can be properly rendered.
   SetWindowPlacement(GetNativeView(), &saved_window_placement);
 
   // WM_DWMCOMPOSITIONCHANGED is only sent to top level windows, however we want
@@ skipping 720 matching lines @@
     resize_cursors_[RC_NORMAL] = LoadCursor(NULL, IDC_ARROW);
     resize_cursors_[RC_VERTICAL] = LoadCursor(NULL, IDC_SIZENS);
     resize_cursors_[RC_HORIZONTAL] = LoadCursor(NULL, IDC_SIZEWE);
     resize_cursors_[RC_NESW] = LoadCursor(NULL, IDC_SIZENESW);
     resize_cursors_[RC_NWSE] = LoadCursor(NULL, IDC_SIZENWSE);
     initialized = true;
   }
 }
 
 }  // namespace views