Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3107)

Unified Diff: chrome/browser/ui/panels/panel_browser_view.cc

Issue 10187021: Add key modifier to minimize/restore button click to minimize/restore-all panels for Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pass modifier instead of event around. Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel_browser_view.cc
diff --git a/chrome/browser/ui/panels/panel_browser_view.cc b/chrome/browser/ui/panels/panel_browser_view.cc
index bc154189aa452b03c6cb5d315201d559f1849d79..5430fead16c68a8f8af26abe854da9397c02895c 100644
--- a/chrome/browser/ui/panels/panel_browser_view.cc
+++ b/chrome/browser/ui/panels/panel_browser_view.cc
@@ -23,10 +23,6 @@
#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,
@@ -475,7 +471,7 @@ bool PanelBrowserView::OnTitlebarMouseDragged(
return true;
}
-bool PanelBrowserView::OnTitlebarMouseReleased() {
+bool PanelBrowserView::OnTitlebarMouseReleased(panel::ClickModifier modifier) {
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
@@ -500,16 +496,7 @@ bool PanelBrowserView::OnTitlebarMouseReleased() {
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(modifier);
return true;
}
@@ -615,44 +602,12 @@ NativePanelTestingWin::NativePanelTestingWin(
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);
}
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();
+ panel_browser_view_->OnTitlebarMouseReleased(modifier);
}
void NativePanelTestingWin::DragTitlebar(const gfx::Point& mouse_location) {
@@ -664,7 +619,7 @@ void NativePanelTestingWin::CancelDragTitlebar() {
}
void NativePanelTestingWin::FinishDragTitlebar() {
- panel_browser_view_->OnTitlebarMouseReleased();
+ panel_browser_view_->OnTitlebarMouseReleased(panel::NO_MODIFIER);
}
bool NativePanelTestingWin::VerifyDrawingAttention() const {
« no previous file with comments | « chrome/browser/ui/panels/panel_browser_view.h ('k') | chrome/browser/ui/panels/panel_browser_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698