| 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 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 5 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
| 6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
| 7 | 7 |
| 8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 // NavigationController* controller = | 64 // NavigationController* controller = |
| 65 // &browser()->tab_strip_model()->GetWebContentsAt(0)->GetController(); | 65 // &browser()->tab_strip_model()->GetWebContentsAt(0)->GetController(); |
| 66 // | 66 // |
| 67 // // Navigate somewhere else. | 67 // // Navigate somewhere else. |
| 68 // GURL url2("http://foo/2"); | 68 // GURL url2("http://foo/2"); |
| 69 // NavigateAndCommit(controller, url2); | 69 // NavigateAndCommit(controller, url2); |
| 70 // | 70 // |
| 71 // // This is equivalent to the above, and lets you test pending navigations. | 71 // // This is equivalent to the above, and lets you test pending navigations. |
| 72 // browser()->OpenURL(OpenURLParams( | 72 // browser()->OpenURL(OpenURLParams( |
| 73 // GURL("http://foo/2"), GURL(), CURRENT_TAB, | 73 // GURL("http://foo/2"), GURL(), CURRENT_TAB, |
| 74 // content::PAGE_TRANSITION_TYPED, false)); | 74 // ui::PAGE_TRANSITION_TYPED, false)); |
| 75 // CommitPendingLoad(controller); | 75 // CommitPendingLoad(controller); |
| 76 // | 76 // |
| 77 // Subclasses must invoke BrowserWithTestWindowTest::SetUp as it is responsible | 77 // Subclasses must invoke BrowserWithTestWindowTest::SetUp as it is responsible |
| 78 // for creating the various objects of this class. | 78 // for creating the various objects of this class. |
| 79 class BrowserWithTestWindowTest : public testing::Test { | 79 class BrowserWithTestWindowTest : public testing::Test { |
| 80 public: | 80 public: |
| 81 // Creates a BrowserWithTestWindowTest for which the initial window will be | 81 // Creates a BrowserWithTestWindowTest for which the initial window will be |
| 82 // a tabbed browser created on the native desktop, which is not a hosted app. | 82 // a tabbed browser created on the native desktop, which is not a hosted app. |
| 83 BrowserWithTestWindowTest(); | 83 BrowserWithTestWindowTest(); |
| 84 | 84 |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 // The desktop to create the initial window on. | 206 // The desktop to create the initial window on. |
| 207 chrome::HostDesktopType host_desktop_type_; | 207 chrome::HostDesktopType host_desktop_type_; |
| 208 | 208 |
| 209 // Whether the browser is part of a hosted app. | 209 // Whether the browser is part of a hosted app. |
| 210 bool hosted_app_; | 210 bool hosted_app_; |
| 211 | 211 |
| 212 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); | 212 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); |
| 213 }; | 213 }; |
| 214 | 214 |
| 215 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 215 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
| OLD | NEW |