Add key modifier to minimize/restore button click to minimize/restore-all panels for Windows.

chrome/browser/ui/panels/panel_browser_view.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/panels/panel_browser_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/native_window_notification_source.h"
 #include "chrome/browser/ui/panels/display_settings_provider.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_bounds_animation.h"
 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/views/events/event.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-#include "base/win/win_util.h"  // for IsCtrlPressed()
-#endif
-
 using content::WebContents;
 
 NativePanel* Panel::CreateNativePanel(Browser* browser, Panel* panel,
                                       const gfx::Rect& bounds) {
   PanelBrowserView* view = new PanelBrowserView(browser, panel, bounds);
   (new BrowserFrame(view))->InitBrowserFrame();
   return view;
 }
 
 PanelBrowserView::PanelBrowserView(Browser* browser, Panel* panel,
@@ skipping 393 matching lines @@
                  SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 PanelBrowserFrameView* PanelBrowserView::GetFrameView() const {
   return static_cast<PanelBrowserFrameView*>(frame()->GetFrameView());
 }
 
-bool PanelBrowserView::OnTitlebarMousePressed(
-    const gfx::Point& mouse_location) {
+bool PanelBrowserView::OnTitlebarMousePressed(const views::MouseEvent& event) {
+  // |event.location| is in the view's coordinate system. Convert it to the
+  // screen coordinate system.
+  gfx::Point mouse_location = event.location();
+  views::View::ConvertPointToScreen(this, &mouse_location);

[jianli, 2012/04/27 22:32:10]

|event| is for PanelBrowserFrameView, not PanelBrowserView. Thus
|event.location| is in PanelBrowserFrameView's coordinate system. I think we
should try not to pass event to PanelBrowserView.

[jennb, 2012/04/27 23:27:54]

Changed to pass modifier around rather than event. diff against original is
easier to read than the diff against the previous revision as I was mostly
undoing changes I made in the 1st revision.

+
   mouse_pressed_ = true;
   mouse_dragging_state_ = NO_DRAGGING;
   last_mouse_location_ = mouse_location;
   return true;
 }
 
-bool PanelBrowserView::OnTitlebarMouseDragged(
-    const gfx::Point& mouse_location) {
+bool PanelBrowserView::OnTitlebarMouseDragged(const views::MouseEvent& event) {
   if (!mouse_pressed_)
     return false;
 
+  // |event.location| is in the view's coordinate system. Convert it to the
+  // screen coordinate system.
+  gfx::Point mouse_location = event.location();
+  views::View::ConvertPointToScreen(this, &mouse_location);
+
   int delta_x = mouse_location.x() - last_mouse_location_.x();
   int delta_y = mouse_location.y() - last_mouse_location_.y();
   if (mouse_dragging_state_ == NO_DRAGGING &&
       ExceededDragThreshold(delta_x, delta_y)) {
     // When a drag begins, we do not want to the client area to still receive
     // the focus.
     old_focused_view_ = GetFocusManager()->GetFocusedView();
     GetFocusManager()->SetFocusedView(GetFrameView());
 
     panel_->manager()->StartDragging(panel_.get(), last_mouse_location_);
     mouse_dragging_state_ = DRAGGING_STARTED;
   }
   if (mouse_dragging_state_ == DRAGGING_STARTED) {
     panel_->manager()->Drag(mouse_location);
 
     // Once in drag, update |last_mouse_location_| on each drag fragment, since
     // we already dragged the panel up to the current mouse location.
     last_mouse_location_ = mouse_location;
   }
   return true;
 }
 
-bool PanelBrowserView::OnTitlebarMouseReleased() {
+bool PanelBrowserView::OnTitlebarMouseReleased(const views::MouseEvent& event) {
   if (mouse_dragging_state_ != NO_DRAGGING) {
     // Ensure dragging a minimized panel does not leave it activated.
     // Windows activates a panel on mouse-down, regardless of our attempts
     // to prevent activation of a minimized panel. Now that we know mouse-down
     // resulted in a mouse-drag, we need to ensure the minimized panel is
     // deactivated.
     if (panel_->IsMinimized() && panel_->IsActive())
       panel_->Deactivate();
 
     if (mouse_dragging_state_ == DRAGGING_STARTED) {
       // When a drag ends, restore the focus.
       if (old_focused_view_) {
         GetFocusManager()->SetFocusedView(old_focused_view_);
         old_focused_view_ = NULL;
       }
       return EndDragging(false);
     }
 
     // Else, the panel drag was cancelled before the mouse is released. Do not
     // treat this as a click.
     if (mouse_dragging_state_ != NO_DRAGGING)
       return true;
   }
 
-  panel::ClickModifier click_modifier = panel::NO_MODIFIER;
-#if defined(OS_WIN) && !defined(USE_AURA)
-  if (base::win::IsCtrlPressed()) {
-    click_modifier = panel::APPLY_TO_ALL;
-  }
-#else
-  // Proceed without modifier.
-#endif
-
-  panel_->OnTitlebarClicked(click_modifier);
+  panel_->OnTitlebarClicked(
+      event.IsControlDown() ? panel::APPLY_TO_ALL : panel::NO_MODIFIER);
   return true;
 }
 
 bool PanelBrowserView::OnTitlebarMouseCaptureLost() {
   if (mouse_dragging_state_ == DRAGGING_STARTED)
     return EndDragging(true);
   return true;
 }
 
 bool PanelBrowserView::EndDragging(bool cancelled) {
   // Only handle clicks that started in our window.
   if (!mouse_pressed_)
     return false;
   mouse_pressed_ = false;
 
   mouse_dragging_state_ = DRAGGING_ENDED;
   panel_->manager()->EndDragging(cancelled);
   return true;
 }
 
+void PanelBrowserView::MinimizeButtonPressed(const views::Event& event) {
+  panel_->OnMinimizeButtonClicked(
+      event.IsControlDown() ? panel::APPLY_TO_ALL : panel::NO_MODIFIER);
+}
+
+void PanelBrowserView::RestoreButtonPressed(const views::Event& event) {
+  panel_->OnRestoreButtonClicked(
+      event.IsControlDown() ? panel::APPLY_TO_ALL : panel::NO_MODIFIER);
+}
+
 void PanelBrowserView::SetPanelAppIconVisibility(bool visible) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   gfx::NativeWindow native_window = GetNativeHandle();
   int style = ::GetWindowLong(native_window, GWL_EXSTYLE);
   int new_style = style;
   if (visible)
     new_style &= (~WS_EX_TOOLWINDOW);
   else
     new_style |= WS_EX_TOOLWINDOW;
   if (style != new_style) {
@@ skipping 65 matching lines @@
 
 NativePanelTestingWin::NativePanelTestingWin(
     PanelBrowserView* panel_browser_view) :
     panel_browser_view_(panel_browser_view) {
   PanelBrowserFrameView* frame_view = panel_browser_view_->GetFrameView();
   frame_view->title_label_->SetAutoColorReadabilityEnabled(false);
 }
 
 void NativePanelTestingWin::PressLeftMouseButtonTitlebar(
     const gfx::Point& mouse_location, panel::ClickModifier modifier) {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  if (modifier == panel::APPLY_TO_ALL) {
-    BYTE keyState[256];
-    ::GetKeyboardState(keyState);
-    BYTE newKeyState[256];
-    memcpy(newKeyState, keyState, sizeof(keyState));
-    newKeyState[VK_CONTROL] = 0x80;
-    ::SetKeyboardState(newKeyState);
-    panel_browser_view_->OnTitlebarMousePressed(mouse_location);
-    ::SetKeyboardState(keyState);  // restore to original
-    return;
-  }
-#else
-  // Cannot test with modifier. Proceed without it.
-#endif
-
-  panel_browser_view_->OnTitlebarMousePressed(mouse_location);
+  int flags = ui::EF_LEFT_MOUSE_BUTTON;
+  if (modifier == panel::APPLY_TO_ALL)
+    flags |= ui::EF_CONTROL_DOWN;
+  views::MouseEvent event(ui::ET_MOUSE_PRESSED,
+                          mouse_location.x(),
+                          mouse_location.y(),
+                          flags);
+  panel_browser_view_->OnTitlebarMousePressed(event);
 }
 
 void NativePanelTestingWin::ReleaseMouseButtonTitlebar(
     panel::ClickModifier modifier) {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  if (modifier == panel::APPLY_TO_ALL) {
-    BYTE keyState[256];
-    ::GetKeyboardState(keyState);
-    BYTE newKeyState[256];
-    memcpy(newKeyState, keyState, sizeof(keyState));
-    newKeyState[VK_CONTROL] = 0x80;
-    ::SetKeyboardState(newKeyState);
-    panel_browser_view_->OnTitlebarMouseReleased();
-    ::SetKeyboardState(keyState);  // restore to original
-    return;
-  }
-#else
-  // Cannot test with modifier. Proceed without it.
-#endif
-
-  panel_browser_view_->OnTitlebarMouseReleased();
+  int flags = ui::EF_RIGHT_MOUSE_BUTTON;
+  if (modifier == panel::APPLY_TO_ALL)
+    flags |= ui::EF_CONTROL_DOWN;
+  // Mouse location does not matter on button release.
+  views::MouseEvent event(ui::ET_MOUSE_RELEASED,
+                          0,
+                          0,
+                          flags);
+  panel_browser_view_->OnTitlebarMouseReleased(event);
 }
 
 void NativePanelTestingWin::DragTitlebar(const gfx::Point& mouse_location) {
-  panel_browser_view_->OnTitlebarMouseDragged(mouse_location);
+  views::MouseEvent event(ui::ET_MOUSE_PRESSED,
+                          mouse_location.x(),
+                          mouse_location.y(),
+                          ui::EF_LEFT_MOUSE_BUTTON);
+  panel_browser_view_->OnTitlebarMouseDragged(event);
 }
 
 void NativePanelTestingWin::CancelDragTitlebar() {
   panel_browser_view_->OnTitlebarMouseCaptureLost();
 }
 
 void NativePanelTestingWin::FinishDragTitlebar() {
-  panel_browser_view_->OnTitlebarMouseReleased();
+  ReleaseMouseButtonTitlebar(panel::NO_MODIFIER);
 }
 
 bool NativePanelTestingWin::VerifyDrawingAttention() const {
   PanelBrowserFrameView* frame_view = panel_browser_view_->GetFrameView();
   SkColor attention_color = frame_view->GetTitleColor(
       PanelBrowserFrameView::PAINT_FOR_ATTENTION);
   return attention_color == frame_view->title_label_->enabled_color();
 }
 
 bool NativePanelTestingWin::VerifyActiveState(bool is_active) {
@@ skipping 26 matching lines @@
       return frame_view->close_button_->visible();
     case MINIMIZE_BUTTON:
       return frame_view->minimize_button_->visible();
     case RESTORE_BUTTON:
       return frame_view->restore_button_->visible();
     default:
       NOTREACHED();
   }
   return false;
 }