| 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/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" | 
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" | 
| 11 #include "base/sys_info.h" | 11 #include "base/sys_info.h" | 
|  | 12 #include "base/utf_string_conversions.h" | 
| 12 #include "chrome/app/chrome_dll_resource.h" | 13 #include "chrome/app/chrome_dll_resource.h" | 
| 13 #include "chrome/browser/app_modal_dialog.h" | 14 #include "chrome/browser/app_modal_dialog.h" | 
| 14 #include "chrome/browser/browser.h" | 15 #include "chrome/browser/browser.h" | 
| 15 #include "chrome/browser/browser_init.h" | 16 #include "chrome/browser/browser_init.h" | 
| 16 #include "chrome/browser/browser_list.h" | 17 #include "chrome/browser/browser_list.h" | 
| 17 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" | 
| 18 #include "chrome/browser/browser_window.h" | 19 #include "chrome/browser/browser_window.h" | 
| 19 #include "chrome/browser/defaults.h" | 20 #include "chrome/browser/defaults.h" | 
| 20 #include "chrome/browser/extensions/extension_browsertest.h" | 21 #include "chrome/browser/extensions/extension_browsertest.h" | 
| 21 #include "chrome/browser/extensions/extensions_service.h" | 22 #include "chrome/browser/extensions/extensions_service.h" | 
| (...skipping 961 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 983 | 984 | 
| 984   // The normal browser should now have four. | 985   // The normal browser should now have four. | 
| 985   EXPECT_EQ(4, browser()->tab_count()); | 986   EXPECT_EQ(4, browser()->tab_count()); | 
| 986 | 987 | 
| 987   // Close the additional browsers. | 988   // Close the additional browsers. | 
| 988   popup_browser->CloseAllTabs(); | 989   popup_browser->CloseAllTabs(); | 
| 989   app_browser->CloseAllTabs(); | 990   app_browser->CloseAllTabs(); | 
| 990   app_popup_browser->CloseAllTabs(); | 991   app_popup_browser->CloseAllTabs(); | 
| 991 } | 992 } | 
| 992 #endif | 993 #endif | 
| OLD | NEW | 
|---|