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

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

Issue 1149263003: Add user_gesture param to BaseWindow::Activate Base URL: https://chromium.googlesource.com/chromium/src.git@ug2_WebContentsDelegate_ActivateContents
Patch Set: Update callers Created 5 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
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 ce45650c88811d9ae273f2b6fa33bc5530ac3118..2c0f0d6b0527ba1bf5e1bd5d6762164cd921a79d 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -954,24 +954,24 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ActivatePanelOrTabbedWindow) {
Panel* panel2 = CreatePanel("Panel2");
// Activate main tabbed window.
- browser()->window()->Activate();
+ browser()->window()->Activate(false /* user_gesture */);
WaitForPanelActiveState(panel2, SHOW_AS_INACTIVE);
// Activate a panel.
- panel2->Activate();
+ panel2->Activate(false /* user_gesture */);
WaitForPanelActiveState(panel2, SHOW_AS_ACTIVE);
// Activate the main tabbed window back.
- browser()->window()->Activate();
+ browser()->window()->Activate(false /* user_gesture */);
WaitForPanelActiveState(panel2, SHOW_AS_INACTIVE);
// Activate another panel.
- panel1->Activate();
+ panel1->Activate(false /* user_gesture */);
WaitForPanelActiveState(panel1, SHOW_AS_ACTIVE);
WaitForPanelActiveState(panel2, SHOW_AS_INACTIVE);
// Switch focus between panels.
- panel2->Activate();
+ panel2->Activate(false /* user_gesture */);
WaitForPanelActiveState(panel2, SHOW_AS_ACTIVE);
WaitForPanelActiveState(panel1, SHOW_AS_INACTIVE);
@@ -1036,7 +1036,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ActivateDeactivateMultiple) {
EXPECT_FALSE(tabbed_window->IsActive());
// Activating P1 should cause P3 to lose focus.
- panels[1]->Activate();
+ panels[1]->Activate(false /* user_gesture */);
last_active_states = expected_active_states;
expected_active_states = ProduceExpectedActiveStates(1);
WaitForPanelActiveStates(last_active_states, expected_active_states);
@@ -1112,7 +1112,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionWhileMinimized) {
EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
// Test that the attention is cleared when activated.
- panel1->Activate();
+ panel1->Activate(false /* user_gesture */);
WaitForPanelActiveState(panel1, SHOW_AS_ACTIVE);
EXPECT_FALSE(panel1->IsDrawingAttention());
EXPECT_EQ(Panel::EXPANDED, panel1->expansion_state());
@@ -1217,7 +1217,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionResetOnActivate) {
EXPECT_TRUE(native_panel_testing->VerifyDrawingAttention());
// Test that the attention is cleared when panel gets focus.
- panel->Activate();
+ panel->Activate(false /* user_gesture */);
WaitForPanelActiveState(panel, SHOW_AS_ACTIVE);
EXPECT_FALSE(panel->IsDrawingAttention());
EXPECT_FALSE(native_panel_testing->VerifyDrawingAttention());
@@ -1315,7 +1315,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, FocusLostOnMinimize) {
IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateInactiveSwitchToActive) {
Panel* panel = CreateInactivePanel("1");
- panel->Activate();
+ panel->Activate(false /* user_gesture */);
WaitForPanelActiveState(panel, SHOW_AS_ACTIVE);
panel->Close();
@@ -1348,7 +1348,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
EXPECT_EQ(Panel::EXPANDED, panel1->expansion_state());
EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
- panel1->Activate();
+ panel1->Activate(false /* user_gesture */);
WaitForPanelActiveState(panel1, SHOW_AS_ACTIVE);
panel1->SetExpansionState(Panel::MINIMIZED);

Powered by Google App Engine
This is Rietveld 408576698