Chromium Code Reviews| 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..e45f0963a2cb944d53c20a92864f09445213a690 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,26 @@ 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); |
| + MessageLoopForUI::current()->RunAllPending(); |
|
jennb
2011/12/10 00:42:46
Think we don't really need RunAllPending here as e
jianli
2011/12/13 23:23:40
Done.
|
| +} |
| + |
| +std::string BasePanelBrowserTest::GetPanelName(int index) { |
|
jennb
2011/12/10 00:42:46
MakePanelName?
jianli
2011/12/13 23:23:40
Done.
|
| + std::string panel_name("Panel"); |
| + return panel_name + base::IntToString(index); |
| +} |