Merge 143447 - On Windows 8 when a metro application is snapped running desktop application windows…

chrome/browser/ui/views/frame/browser_frame_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/ui/views/frame/browser_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
-
 #include <set>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/metro.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/system_menu_model.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/menu/native_menu_win.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_win.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 #include "webkit/glue/window_open_disposition.h"
@@ skipping 35 matching lines @@
   switcher_button->SetImage(
       views::ImageButton::BS_HOT,
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           is_off_the_record ? IDR_INCOGNITO_SWITCH_OFF :
                               IDR_INCOGNITO_SWITCH_ON));
   switcher_button->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                                      views::ImageButton::ALIGN_MIDDLE);
   return switcher_button;
 }
 
+static int GetMinimizeButtonOffsetForWindow(gfx::NativeView window) {
+  // The WM_GETTITLEBARINFOEX message can fail if we are not active/visible.
+  TITLEBARINFOEX titlebar_info = {0};
+  titlebar_info.cbSize = sizeof(TITLEBARINFOEX);
+  SendMessage(window, WM_GETTITLEBARINFOEX, 0,
+              reinterpret_cast<WPARAM>(&titlebar_info));
+
+  CPoint minimize_button_corner(titlebar_info.rgrect[2].left,
+                                titlebar_info.rgrect[2].top);
+  MapWindowPoints(HWND_DESKTOP, window, &minimize_button_corner, 1);
+  return minimize_button_corner.x;
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameWin, public:
 
 BrowserFrameWin::BrowserFrameWin(BrowserFrame* browser_frame,
                                  BrowserView* browser_view)
     : views::NativeWidgetWin(browser_frame),
       browser_view_(browser_view),
       browser_frame_(browser_frame),
       system_menu_delegate_(new SystemMenuModelDelegate(browser_view,
-          browser_view->browser())) {
+          browser_view->browser())),
+      cached_minimize_button_x_delta_(0) {
   if (base::win::IsMetroProcess()) {
     browser_view->SetWindowSwitcherButton(
         MakeWindowSwitcherButton(this, browser_view->IsOffTheRecord()));
   }
 }
 
 BrowserFrameWin::~BrowserFrameWin() {
 }
 
 // static
@@ skipping 134 matching lines @@
 void BrowserFrameWin::ShowWithWindowState(ui::WindowShowState show_state) {
   AdjustFrameForImmersiveMode();
   views::NativeWidgetWin::ShowWithWindowState(show_state);
 }
 
 void BrowserFrameWin::Close() {
   CloseImmersiveFrame();
   views::NativeWidgetWin::Close();
 }
 
+void BrowserFrameWin::OnActivate(UINT action, BOOL minimized, HWND window) {
+  if (action != WA_INACTIVE)
+    CacheMinimizeButtonDelta();
+  views::NativeWidgetWin::OnActivate(action, minimized, window);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrameWin, NativeBrowserFrame implementation:
 
 views::NativeWidget* BrowserFrameWin::AsNativeWidget() {
   return this;
 }
 
 const views::NativeWidget* BrowserFrameWin::AsNativeWidget() const {
   return this;
 }
 
 void BrowserFrameWin::InitSystemContextMenu() {
   system_menu_contents_.reset(new SystemMenuModel(system_menu_delegate_.get()));
   // We add the menu items in reverse order so that insertion_index never needs
   // to change.
   if (browser_view_->IsBrowserTypeNormal())
     BuildSystemMenuForBrowserWindow();
   else
     BuildSystemMenuForAppOrPopupWindow();
   system_menu_.reset(
       new views::NativeMenuWin(system_menu_contents_.get(), GetNativeWindow()));
   system_menu_->Rebuild();
 }
 
 int BrowserFrameWin::GetMinimizeButtonOffset() const {
-  TITLEBARINFOEX titlebar_info;
-  titlebar_info.cbSize = sizeof(TITLEBARINFOEX);
-  SendMessage(GetNativeView(), WM_GETTITLEBARINFOEX, 0, (WPARAM)&titlebar_info);
+  int minimize_button_offset =
+      GetMinimizeButtonOffsetForWindow(GetNativeView());
 
-  CPoint minimize_button_corner(titlebar_info.rgrect[2].left,
-                                titlebar_info.rgrect[2].top);
-  MapWindowPoints(HWND_DESKTOP, GetNativeView(), &minimize_button_corner, 1);
+  if (minimize_button_offset)
+    return minimize_button_offset;
 
-  return minimize_button_corner.x;
+  // If we fail to get the minimize button offset via the WM_GETTITLEBARINFOEX
+  // message then calculate and return this via the
+  // cached_minimize_button_x_delta_ member value. Please see
+  // CacheMinimizeButtonDelta() for more details.
+  DCHECK(cached_minimize_button_x_delta_);
+
+  RECT client_rect = {0};
+  GetClientRect(&client_rect);
+
+  if (base::i18n::IsRTL())
+    return cached_minimize_button_x_delta_;
+  else
+    return client_rect.right - cached_minimize_button_x_delta_;
 }
 
 void BrowserFrameWin::TabStripDisplayModeChanged() {
   UpdateDWMFrame();
 }
 
 void BrowserFrameWin::ButtonPressed(views::Button* sender,
                                     const views::Event& event) {
   HMODULE metro = base::win::GetMetroModule();
   if (!metro)
@@ skipping 201 matching lines @@
   current_tab_info->title = base::win::LocalAllocAndCopyString(
       browser->GetWindowTitleForCurrentTab());
 
   WebContents* current_tab = browser->GetActiveWebContents();
   DCHECK(current_tab);
 
   current_tab_info->url = base::win::LocalAllocAndCopyString(
       UTF8ToWide(current_tab->GetURL().spec()));
 }
 
+void BrowserFrameWin::CacheMinimizeButtonDelta() {
+  int minimize_offset = GetMinimizeButtonOffsetForWindow(GetNativeView());
+  if (!minimize_offset)
+    return;
+
+  RECT rect = {0};
+  GetClientRect(&rect);
+  // Calculate and cache the value of the minimize button delta, i.e. the
+  // offset to be applied to the left or right edge of the client rect
+  // depending on whether the language is RTL or not.
+  // This cached value is only used if the WM_GETTITLEBARINFOEX message fails
+  // to get the offset of the minimize button.
+  if (base::i18n::IsRTL())
+    cached_minimize_button_x_delta_ = minimize_offset;
+  else
+    cached_minimize_button_x_delta_ = rect.right - minimize_offset;
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:
 
 // static
 const gfx::Font& BrowserFrame::GetTitleFont() {
   static gfx::Font* title_font =
       new gfx::Font(views::NativeWidgetWin::GetWindowTitleFont());
   return *title_font;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameWin(browser_frame, browser_view);
 }