| 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" |
| 11 #include "chrome/browser/ui/browser_list.h" | 11 #include "chrome/browser/ui/browser_list.h" |
| 12 #include "chrome/browser/ui/browser_window.h" | 12 #include "chrome/browser/ui/browser_window.h" |
| 13 #include "chrome/browser/ui/extensions/application_launch.h" |
| 13 #include "chrome/browser/ui/panels/panel_manager.h" | 14 #include "chrome/browser/ui/panels/panel_manager.h" |
| 14 #include "chrome/common/chrome_notification_types.h" | 15 #include "chrome/common/chrome_notification_types.h" |
| 15 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/test/base/in_process_browser_test.h" | 17 #include "chrome/test/base/in_process_browser_test.h" |
| 17 #include "chrome/test/base/ui_test_utils.h" | 18 #include "chrome/test/base/ui_test_utils.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 19 | 20 |
| 20 #if defined(OS_MACOSX) | 21 #if defined(OS_MACOSX) |
| 21 #include "base/mac/scoped_nsautorelease_pool.h" | 22 #include "base/mac/scoped_nsautorelease_pool.h" |
| 22 #endif | 23 #endif |
| (...skipping 18 matching lines...) Expand all Loading... |
| 41 | 42 |
| 42 EXPECT_TRUE(LoadExtension(test_data_dir_.AppendASCII(name))); | 43 EXPECT_TRUE(LoadExtension(test_data_dir_.AppendASCII(name))); |
| 43 | 44 |
| 44 ExtensionService* service = browser()->profile()->GetExtensionService(); | 45 ExtensionService* service = browser()->profile()->GetExtensionService(); |
| 45 const extensions::Extension* extension = service->GetExtensionById( | 46 const extensions::Extension* extension = service->GetExtensionById( |
| 46 last_loaded_extension_id_, false); | 47 last_loaded_extension_id_, false); |
| 47 EXPECT_TRUE(extension); | 48 EXPECT_TRUE(extension); |
| 48 | 49 |
| 49 size_t browser_count = BrowserList::size(); | 50 size_t browser_count = BrowserList::size(); |
| 50 | 51 |
| 51 Browser::OpenApplication( | 52 application_launch::OpenApplication( |
| 52 browser()->profile(), | 53 browser()->profile(), |
| 53 extension, | 54 extension, |
| 54 // Overriding manifest to open in a panel. | 55 // Overriding manifest to open in a panel. |
| 55 extension_misc::LAUNCH_PANEL, | 56 extension_misc::LAUNCH_PANEL, |
| 56 GURL(), | 57 GURL(), |
| 57 NEW_WINDOW); | 58 NEW_WINDOW); |
| 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 } |
| (...skipping 37 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 |