| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
| 7 #include "chrome/browser/extensions/extension_browsertest.h" | 7 #include "chrome/browser/extensions/extension_browsertest.h" |
| 8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 EXPECT_TRUE(extension); | 47 EXPECT_TRUE(extension); |
| 48 | 48 |
| 49 size_t browser_count = BrowserList::size(); | 49 size_t browser_count = BrowserList::size(); |
| 50 | 50 |
| 51 Browser::OpenApplication( | 51 Browser::OpenApplication( |
| 52 browser()->profile(), | 52 browser()->profile(), |
| 53 extension, | 53 extension, |
| 54 // Overriding manifest to open in a panel. | 54 // Overriding manifest to open in a panel. |
| 55 extension_misc::LAUNCH_PANEL, | 55 extension_misc::LAUNCH_PANEL, |
| 56 GURL(), | 56 GURL(), |
| 57 NEW_WINDOW); | 57 NEW_WINDOW, |
| 58 NULL); |
| 58 | 59 |
| 59 // Now we have a new browser instance. | 60 // Now we have a new browser instance. |
| 60 EXPECT_EQ(browser_count + 1, BrowserList::size()); | 61 EXPECT_EQ(browser_count + 1, BrowserList::size()); |
| 61 } | 62 } |
| 62 | 63 |
| 63 void CloseWindowAndWait(Browser* browser) { | 64 void CloseWindowAndWait(Browser* browser) { |
| 64 // Closing a browser window may involve several async tasks. Need to use | 65 // Closing a browser window may involve several async tasks. Need to use |
| 65 // message pump and wait for the notification. | 66 // message pump and wait for the notification. |
| 66 size_t browser_count = BrowserList::size(); | 67 size_t browser_count = BrowserList::size(); |
| 67 ui_test_utils::WindowedNotificationObserver signal( | 68 ui_test_utils::WindowedNotificationObserver signal( |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 EXPECT_TRUE(new_browser->is_type_panel()); | 100 EXPECT_TRUE(new_browser->is_type_panel()); |
| 100 | 101 |
| 101 // Now also check that PanelManager has one new Panel under management. | 102 // Now also check that PanelManager has one new Panel under management. |
| 102 EXPECT_EQ(1, panel_manager->num_panels()); | 103 EXPECT_EQ(1, panel_manager->num_panels()); |
| 103 | 104 |
| 104 CloseWindowAndWait(new_browser); | 105 CloseWindowAndWait(new_browser); |
| 105 | 106 |
| 106 EXPECT_EQ(0, panel_manager->num_panels()); | 107 EXPECT_EQ(0, panel_manager->num_panels()); |
| 107 EXPECT_EQ(1u, BrowserList::size()); | 108 EXPECT_EQ(1u, BrowserList::size()); |
| 108 } | 109 } |
| OLD | NEW |