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

Unified Diff: chrome/browser/ui/window_sizer/window_sizer_ash_unittest.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/window_sizer/window_sizer_ash_unittest.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index bcfdd4fd0db929d3f96e1165b6141a43fb8c77a0..bf165725464f874b4d84266af8a1772e77eac0dd 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -43,10 +43,10 @@ class TestBrowserWindowAura : public TestBrowserWindow {
// TestBrowserWindow overrides:
void Show() override {
native_window_->Show();
- Activate();
+ Activate(user_gesture);
}
void Hide() override { native_window_->Hide(); }
- void Activate() override {
+ void Activate(bool user_gesture) override {
aura::client::GetActivationClient(
native_window_->GetRootWindow())->ActivateWindow(native_window_.get());
}
@@ -680,7 +680,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
browser_window->GetNativeWindow()->SetBoundsInScreen(
gfx::Rect(secondary_bounds.CenterPoint().x() - 100, 10, 200, 200),
second_display);
- browser_window->Activate();
+ browser_window->Activate(false /* user_gesture */);
EXPECT_NE(ash::Shell::GetPrimaryRootWindow(),
ash::Shell::GetTargetRootWindow());
gfx::Rect window_bounds;
@@ -697,7 +697,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
// Activate another window in the primary display and create a new window.
// It should be created in the primary display.
{
- another_browser_window->Activate();
+ another_browser_window->Activate(false /* user_gesture */);
EXPECT_EQ(ash::Shell::GetPrimaryRootWindow(),
ash::Shell::GetTargetRootWindow());

Powered by Google App Engine
This is Rietveld 408576698