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

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

Issue 10384192: Prevent title-only panel from fully minimizing when attention is cleared if mouse is in the panel o… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment changed Created 8 years, 7 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
« no previous file with comments | « chrome/browser/ui/panels/docked_panel_strip.cc ('k') | chrome/browser/ui/panels/panel_drag_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 6b4b031331cffd242333cec2f7855b4bd8ee0651..37eab6593d5de7e7021630cebb2e7f8a99ae65c8 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -56,15 +56,6 @@ class PanelBrowserTest : public BasePanelBrowserTest {
}
protected:
- void MoveMouseAndWaitForExpansionStateChange(Panel* panel,
- const gfx::Point& position) {
- ui_test_utils::WindowedNotificationObserver signal(
- chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
- content::Source<Panel>(panel));
- MoveMouse(position);
- signal.Wait();
- }
-
// Helper function for debugging.
void PrintAllPanelBounds() {
const std::vector<Panel*>& panels = PanelManager::GetInstance()->panels();
@@ -1077,6 +1068,25 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, StopDrawingAttentionWhileMinimized) {
EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
EXPECT_EQ(Panel::MINIMIZED, panel2->expansion_state());
+ // Verify minimized panel that is drawing attention stays in title-only mode
+ // after attention is cleared if mouse is in the titlebar area.
+ panel1->FlashFrame(true);
+ EXPECT_TRUE(panel1->IsDrawingAttention());
+ EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
+
+ gfx::Point hover_point_in_panel(panel1->GetBounds().origin());
+ MoveMouse(hover_point_in_panel);
+
+ panel1->FlashFrame(false);
+ EXPECT_FALSE(panel1->IsDrawingAttention());
+ EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
+ EXPECT_EQ(Panel::MINIMIZED, panel2->expansion_state());
+
+ // Move mouse away and panel should go back to fully minimized state.
+ MoveMouseAndWaitForExpansionStateChange(panel1, hover_point);
+ EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
+ EXPECT_EQ(Panel::MINIMIZED, panel2->expansion_state());
+
panel1->Close();
panel2->Close();
}
« no previous file with comments | « chrome/browser/ui/panels/docked_panel_strip.cc ('k') | chrome/browser/ui/panels/panel_drag_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698