| 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 <map> | 5 #include <map> |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
| 8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
| 9 #include "chrome/browser/extensions/extension_system.h" | 9 #include "chrome/browser/extensions/extension_system.h" |
| 10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(), | 268 ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(), |
| 269 browser()->host_desktop_type())); | 269 browser()->host_desktop_type())); |
| 270 ASSERT_EQ(2, browser()->tab_strip_model()->count()); | 270 ASSERT_EQ(2, browser()->tab_strip_model()->count()); |
| 271 #else | 271 #else |
| 272 // Find the app's browser. Opening in a new window will create | 272 // Find the app's browser. Opening in a new window will create |
| 273 // a new browser. | 273 // a new browser. |
| 274 ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile(), | 274 ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile(), |
| 275 browser()->host_desktop_type())); | 275 browser()->host_desktop_type())); |
| 276 Browser* app_browser = FindOtherBrowser(browser()); | 276 Browser* app_browser = FindOtherBrowser(browser()); |
| 277 ASSERT_TRUE(app_browser->is_app()); | 277 ASSERT_TRUE(app_browser->is_app()); |
| 278 ASSERT_FALSE(app_browser->is_type_panel()); | |
| 279 #endif | 278 #endif |
| 280 } | 279 } |
| OLD | NEW |