| 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #include "apps/shell_window_registry.h" | 7 #include "apps/shell_window_registry.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/mac/scoped_nsobject.h" | 9 #include "base/mac/scoped_nsobject.h" |
| 10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
| 11 #import "chrome/browser/app_controller_mac.h" | 11 #import "chrome/browser/app_controller_mac.h" |
| 12 #include "chrome/browser/apps/app_browsertest_util.h" | 12 #include "chrome/browser/apps/app_browsertest_util.h" |
| 13 #include "chrome/browser/extensions/extension_test_message_listener.h" | 13 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 15 #include "chrome/browser/ui/browser_list.h" | 15 #include "chrome/browser/ui/browser_list.h" |
| 16 #include "chrome/browser/ui/browser_window.h" | 16 #include "chrome/browser/ui/browser_window.h" |
| 17 #include "chrome/browser/ui/host_desktop.h" | 17 #include "chrome/browser/ui/host_desktop.h" |
| 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 19 #import "chrome/common/chrome_switches.h" | 19 #import "chrome/common/chrome_switches.h" |
| 20 #include "chrome/common/extensions/extension.h" | |
| 21 #include "chrome/test/base/in_process_browser_test.h" | 20 #include "chrome/test/base/in_process_browser_test.h" |
| 22 #include "chrome/test/base/ui_test_utils.h" | 21 #include "chrome/test/base/ui_test_utils.h" |
| 23 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
| 23 #include "extensions/common/extension.h" |
| 24 | 24 |
| 25 namespace { | 25 namespace { |
| 26 | 26 |
| 27 class AppControllerPlatformAppBrowserTest | 27 class AppControllerPlatformAppBrowserTest |
| 28 : public extensions::PlatformAppBrowserTest { | 28 : public extensions::PlatformAppBrowserTest { |
| 29 protected: | 29 protected: |
| 30 AppControllerPlatformAppBrowserTest() | 30 AppControllerPlatformAppBrowserTest() |
| 31 : active_browser_list_(BrowserList::GetInstance( | 31 : active_browser_list_(BrowserList::GetInstance( |
| 32 chrome::GetActiveDesktop())) { | 32 chrome::GetActiveDesktop())) { |
| 33 } | 33 } |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 EXPECT_FALSE(result); | 107 EXPECT_FALSE(result); |
| 108 EXPECT_EQ(2u, active_browser_list_->size()); | 108 EXPECT_EQ(2u, active_browser_list_->size()); |
| 109 | 109 |
| 110 Browser* browser = active_browser_list_->get(0); | 110 Browser* browser = active_browser_list_->get(0); |
| 111 GURL current_url = | 111 GURL current_url = |
| 112 browser->tab_strip_model()->GetActiveWebContents()->GetURL(); | 112 browser->tab_strip_model()->GetActiveWebContents()->GetURL(); |
| 113 EXPECT_EQ(GetAppURL(), current_url.spec()); | 113 EXPECT_EQ(GetAppURL(), current_url.spec()); |
| 114 } | 114 } |
| 115 | 115 |
| 116 } // namespace | 116 } // namespace |
| OLD | NEW |