| 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 b7c121e6c71286c2fee53e3b8a03f7c5f5f276ff..5b03bc86c44f92467fc1f00cb4fd450f891679b5 100644
|
| --- a/chrome/browser/ui/panels/panel_browsertest.cc
|
| +++ b/chrome/browser/ui/panels/panel_browsertest.cc
|
| @@ -24,6 +24,7 @@
|
| #include "chrome/browser/ui/panels/native_panel.h"
|
| #include "chrome/browser/ui/panels/panel.h"
|
| #include "chrome/browser/ui/panels/panel_manager.h"
|
| +#include "chrome/browser/ui/panels/test_panel_active_state_observer.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/browser/web_applications/web_app.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| @@ -42,9 +43,6 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/gfx/screen.h"
|
|
|
| -// Refactor has only been done for Win and Mac panels so far.
|
| -#if defined(OS_WIN) || defined(OS_MACOSX)
|
| -
|
| using content::BrowserContext;
|
| using content::BrowserThread;
|
| using content::DownloadItem;
|
| @@ -1268,9 +1266,9 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, FocusLostOnMinimize) {
|
| Panel* panel = CreatePanelWithParams(params);
|
| EXPECT_EQ(Panel::EXPANDED, panel->expansion_state());
|
|
|
| - panel->SetExpansionState(Panel::MINIMIZED);
|
| - MessageLoop::current()->RunAllPending();
|
| - WaitForPanelActiveState(panel, SHOW_AS_INACTIVE);
|
| + PanelActiveStateObserver signal(panel, false);
|
| + panel->Minimize();
|
| + signal.Wait();
|
| panel->Close();
|
| }
|
|
|
| @@ -1586,4 +1584,3 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_Accelerator) {
|
| EXPECT_EQ(0, panel_manager->num_panels());
|
| }
|
|
|
| -#endif // OS_WIN || OS_MACOSX
|
|
|