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/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
10 #include "chrome/browser/extensions/extension_system.h" | 10 #include "chrome/browser/extensions/extension_system.h" |
11 #include "chrome/browser/extensions/extension_test_message_listener.h" | 11 #include "chrome/browser/extensions/extension_test_message_listener.h" |
12 #include "chrome/browser/extensions/launch_util.h" | 12 #include "chrome/browser/extensions/launch_util.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/browser_commands.h" | 15 #include "chrome/browser/ui/browser_commands.h" |
16 #include "chrome/browser/ui/browser_finder.h" | 16 #include "chrome/browser/ui/browser_finder.h" |
17 #include "chrome/browser/ui/browser_iterator.h" | 17 #include "chrome/browser/ui/browser_iterator.h" |
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
| 20 #include "chrome/common/extensions/extension_constants.h" |
20 #include "content/public/test/test_utils.h" | 21 #include "content/public/test/test_utils.h" |
21 #include "extensions/browser/test_management_policy.h" | 22 #include "extensions/browser/test_management_policy.h" |
22 #include "extensions/common/manifest.h" | 23 #include "extensions/common/manifest.h" |
23 | 24 |
24 using extensions::Extension; | 25 using extensions::Extension; |
25 using extensions::Manifest; | 26 using extensions::Manifest; |
26 | 27 |
27 namespace { | 28 namespace { |
28 | 29 |
29 // Find a browser other than |browser|. | 30 // Find a browser other than |browser|. |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 ASSERT_EQ(2, browser()->tab_strip_model()->count()); | 298 ASSERT_EQ(2, browser()->tab_strip_model()->count()); |
298 #else | 299 #else |
299 // Find the app's browser. Opening in a new window will create | 300 // Find the app's browser. Opening in a new window will create |
300 // a new browser. | 301 // a new browser. |
301 ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile(), | 302 ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile(), |
302 browser()->host_desktop_type())); | 303 browser()->host_desktop_type())); |
303 Browser* app_browser = FindOtherBrowser(browser()); | 304 Browser* app_browser = FindOtherBrowser(browser()); |
304 ASSERT_TRUE(app_browser->is_app()); | 305 ASSERT_TRUE(app_browser->is_app()); |
305 #endif | 306 #endif |
306 } | 307 } |
OLD | NEW |