OLD | NEW |
1 | 1 |
2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
3 // Use of this source code is governed by a BSD-style license that can be | 3 // Use of this source code is governed by a BSD-style license that can be |
4 // found in the LICENSE file. | 4 // found in the LICENSE file. |
5 | 5 |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "chrome/browser/extensions/extension_browsertest.h" | 8 #include "chrome/browser/extensions/extension_browsertest.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 last_loaded_extension_id_, false); | 46 last_loaded_extension_id_, false); |
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 NEW_WINDOW); | 57 NEW_WINDOW); |
57 | 58 |
58 // Now we have a new browser instance. | 59 // Now we have a new browser instance. |
59 EXPECT_EQ(browser_count + 1, BrowserList::size()); | 60 EXPECT_EQ(browser_count + 1, BrowserList::size()); |
60 } | 61 } |
61 | 62 |
62 void CloseWindowAndWait(Browser* browser) { | 63 void CloseWindowAndWait(Browser* browser) { |
63 // Closing a browser window may involve several async tasks. Need to use | 64 // Closing a browser window may involve several async tasks. Need to use |
64 // message pump and wait for the notification. | 65 // message pump and wait for the notification. |
65 size_t browser_count = BrowserList::size(); | 66 size_t browser_count = BrowserList::size(); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 EXPECT_TRUE(new_browser->is_type_panel()); | 99 EXPECT_TRUE(new_browser->is_type_panel()); |
99 | 100 |
100 // Now also check that PanelManager has one new Panel under management. | 101 // Now also check that PanelManager has one new Panel under management. |
101 EXPECT_EQ(1, panel_manager->num_panels()); | 102 EXPECT_EQ(1, panel_manager->num_panels()); |
102 | 103 |
103 CloseWindowAndWait(new_browser); | 104 CloseWindowAndWait(new_browser); |
104 | 105 |
105 EXPECT_EQ(0, panel_manager->num_panels()); | 106 EXPECT_EQ(0, panel_manager->num_panels()); |
106 EXPECT_EQ(1u, BrowserList::size()); | 107 EXPECT_EQ(1u, BrowserList::size()); |
107 } | 108 } |
OLD | NEW |