| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
| 10 #include "base/sys_info.h" | 10 #include "base/sys_info.h" |
| 11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 12 #include "chrome/app/chrome_dll_resource.h" | 12 #include "chrome/app/chrome_command_ids.h" |
| 13 #include "chrome/browser/app_modal_dialog.h" | 13 #include "chrome/browser/app_modal_dialog.h" |
| 14 #include "chrome/browser/browser.h" | 14 #include "chrome/browser/browser.h" |
| 15 #include "chrome/browser/browser_init.h" | 15 #include "chrome/browser/browser_init.h" |
| 16 #include "chrome/browser/browser_list.h" | 16 #include "chrome/browser/browser_list.h" |
| 17 #include "chrome/browser/browser_navigator.h" | 17 #include "chrome/browser/browser_navigator.h" |
| 18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
| 19 #include "chrome/browser/browser_window.h" | 19 #include "chrome/browser/browser_window.h" |
| 20 #include "chrome/browser/defaults.h" | 20 #include "chrome/browser/defaults.h" |
| 21 #include "chrome/browser/extensions/extension_browsertest.h" | 21 #include "chrome/browser/extensions/extension_browsertest.h" |
| 22 #include "chrome/browser/extensions/extensions_service.h" | 22 #include "chrome/browser/extensions/extensions_service.h" |
| (...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 646 | 646 |
| 647 // The normal browser should now have four. | 647 // The normal browser should now have four. |
| 648 EXPECT_EQ(4, browser()->tab_count()); | 648 EXPECT_EQ(4, browser()->tab_count()); |
| 649 | 649 |
| 650 // Close the additional browsers. | 650 // Close the additional browsers. |
| 651 popup_browser->CloseAllTabs(); | 651 popup_browser->CloseAllTabs(); |
| 652 app_browser->CloseAllTabs(); | 652 app_browser->CloseAllTabs(); |
| 653 app_popup_browser->CloseAllTabs(); | 653 app_popup_browser->CloseAllTabs(); |
| 654 } | 654 } |
| 655 #endif | 655 #endif |
| OLD | NEW |