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 "ui/web_dialogs/web_dialog_web_contents_delegate.h" | 5 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
12 #include "chrome/browser/ui/browser_finder.h" | 12 #include "chrome/browser/ui/browser_finder.h" |
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
14 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" | 14 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" |
15 #include "chrome/common/url_constants.h" | 15 #include "chrome/common/url_constants.h" |
16 #include "chrome/test/base/browser_with_test_window_test.h" | 16 #include "chrome/test/base/browser_with_test_window_test.h" |
17 #include "chrome/test/base/test_browser_window.h" | 17 #include "chrome/test/base/test_browser_window.h" |
18 #include "chrome/test/base/testing_profile.h" | 18 #include "chrome/test/base/testing_profile.h" |
19 #include "components/history/core/browser/history_types.h" | 19 #include "components/history/core/browser/history_types.h" |
20 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
21 #include "content/public/test/web_contents_tester.h" | 21 #include "content/public/test/web_contents_tester.h" |
22 #include "testing/gmock/include/gmock/gmock.h" | 22 #include "testing/gmock/include/gmock/gmock.h" |
23 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
24 #include "ui/gfx/rect.h" | 24 #include "ui/gfx/geometry/rect.h" |
25 #include "url/gurl.h" | 25 #include "url/gurl.h" |
26 | 26 |
27 using content::OpenURLParams; | 27 using content::OpenURLParams; |
28 using content::Referrer; | 28 using content::Referrer; |
29 using content::BrowserContext; | 29 using content::BrowserContext; |
30 using content::WebContents; | 30 using content::WebContents; |
31 using content::WebContentsTester; | 31 using content::WebContentsTester; |
32 using ui::WebDialogWebContentsDelegate; | 32 using ui::WebDialogWebContentsDelegate; |
33 | 33 |
34 namespace { | 34 namespace { |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 NEW_FOREGROUND_TAB, | 112 NEW_FOREGROUND_TAB, |
113 ui::PAGE_TRANSITION_LINK, | 113 ui::PAGE_TRANSITION_LINK, |
114 false)); | 114 false)); |
115 test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB, | 115 test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB, |
116 gfx::Rect(), false, NULL); | 116 gfx::Rect(), false, NULL); |
117 EXPECT_EQ(0, browser()->tab_strip_model()->count()); | 117 EXPECT_EQ(0, browser()->tab_strip_model()->count()); |
118 EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); | 118 EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); |
119 } | 119 } |
120 | 120 |
121 } // namespace | 121 } // namespace |
OLD | NEW |