| Index: chrome/browser/ui/panels/base_panel_browser_test.cc
|
| diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| index 34828f7a1cf24003b9e8df2bb65b1196c80bd25c..7619a6d0b107e7c64669de2e4ec61c022b37764e 100644
|
| --- a/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| +++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| @@ -11,11 +11,13 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/message_loop.h"
|
| #include "base/path_service.h"
|
| +#include "base/string_number_conversions.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/panels/native_panel.h"
|
| #include "chrome/browser/ui/panels/panel_manager.h"
|
| +#include "chrome/browser/ui/panels/panel_mouse_watcher.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -151,7 +153,7 @@ void MockAutoHidingDesktopBarImpl::NotifyThicknessChange() {
|
| }
|
|
|
| bool ExistsPanel(Panel* panel) {
|
| - const PanelManager::Panels& panels = PanelManager::GetInstance()->panels();
|
| + std::vector<Panel*> panels = PanelManager::GetInstance()->panels();
|
| return find(panels.begin(), panels.end(), panel) != panels.end();
|
| }
|
|
|
| @@ -379,3 +381,25 @@ scoped_refptr<Extension> BasePanelBrowserTest::CreateExtension(
|
| OnExtensionInstalled(extension.get(), false, -1);
|
| return extension;
|
| }
|
| +
|
| +void BasePanelBrowserTest::CloseWindowAndWait(Browser* browser) {
|
| + // Closing a browser window may involve several async tasks. Need to use
|
| + // message pump and wait for the notification.
|
| + size_t browser_count = BrowserList::size();
|
| + ui_test_utils::WindowedNotificationObserver signal(
|
| + chrome::NOTIFICATION_BROWSER_CLOSED,
|
| + content::Source<Browser>(browser));
|
| + browser->CloseWindow();
|
| + signal.Wait();
|
| + // Now we have one less browser instance.
|
| + EXPECT_EQ(browser_count - 1, BrowserList::size());
|
| +}
|
| +
|
| +void BasePanelBrowserTest::MoveMouse(const gfx::Point& position) {
|
| + PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position);
|
| +}
|
| +
|
| +std::string BasePanelBrowserTest::MakePanelName(int index) {
|
| + std::string panel_name("Panel");
|
| + return panel_name + base::IntToString(index);
|
| +}
|
|
|