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

Unified Diff: ui/views/window/dialog_delegate_unittest.cc

Issue 1782773002: MacViews: Fix ViewTest.HandleAccelerator by faking window activation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Delay the activatableness Created 4 years, 9 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
« ui/views/view_unittest.cc ('K') | « ui/views/views.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/window/dialog_delegate_unittest.cc
diff --git a/ui/views/window/dialog_delegate_unittest.cc b/ui/views/window/dialog_delegate_unittest.cc
index 124e0e49996d2d0ea6a7151afba52c8b6d1b6faf..1dd4f0134022c4417f1209b1b70f4fa2f5cd3b37 100644
--- a/ui/views/window/dialog_delegate_unittest.cc
+++ b/ui/views/window/dialog_delegate_unittest.cc
@@ -18,10 +18,6 @@
#include "ui/views/window/dialog_client_view.h"
#include "ui/views/window/dialog_delegate.h"
-#if defined(OS_MACOSX)
-#include "ui/base/test/scoped_fake_nswindow_focus.h"
-#endif
-
namespace views {
namespace {
@@ -103,6 +99,7 @@ class DialogTest : public ViewsTestBase {
void SetUp() override {
ViewsTestBase::SetUp();
+ EnableMacFakeWindowActivation();
dialog_ = new TestDialog();
DialogDelegate::CreateDialogWidget(dialog_, GetContext(), NULL)->Show();
}
@@ -123,12 +120,6 @@ class DialogTest : public ViewsTestBase {
private:
TestDialog* dialog_;
-#if defined(OS_MACOSX)
- // Causes Widget::Show() to transfer focus synchronously and become immune to
- // losing focus to processes running in parallel.
- ui::test::ScopedFakeNSWindowFocus fake_focus;
-#endif
-
DISALLOW_COPY_AND_ASSIGN(DialogTest);
};
« ui/views/view_unittest.cc ('K') | « ui/views/views.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698