OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "base/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "chrome/browser/browser_type.h" | 8 #include "chrome/browser/browser_type.h" |
9 #include "chrome/browser/navigation_controller.h" | 9 #include "chrome/browser/navigation_controller.h" |
10 #include "chrome/browser/navigation_entry.h" | 10 #include "chrome/browser/navigation_entry.h" |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 WindowOpenDisposition, | 91 WindowOpenDisposition, |
92 const gfx::Rect&, | 92 const gfx::Rect&, |
93 bool user_gesture) {} | 93 bool user_gesture) {} |
94 virtual void ActivateContents(TabContents*) {} | 94 virtual void ActivateContents(TabContents*) {} |
95 virtual void LoadingStateChanged(TabContents*) {} | 95 virtual void LoadingStateChanged(TabContents*) {} |
96 virtual void NavigateToPage(TabContents*, const GURL&, | 96 virtual void NavigateToPage(TabContents*, const GURL&, |
97 PageTransition::Type) {} | 97 PageTransition::Type) {} |
98 virtual void CloseContents(TabContents*) {} | 98 virtual void CloseContents(TabContents*) {} |
99 virtual void MoveContents(TabContents*, const gfx::Rect&) {} | 99 virtual void MoveContents(TabContents*, const gfx::Rect&) {} |
100 virtual bool IsPopup(TabContents*) { return false; } | 100 virtual bool IsPopup(TabContents*) { return false; } |
| 101 virtual bool IsEmbedded(TabContents*) { return false; } |
101 virtual void ToolbarSizeChanged(TabContents* source, bool is_animating) {} | 102 virtual void ToolbarSizeChanged(TabContents* source, bool is_animating) {} |
102 virtual void URLStarredChanged(TabContents* source, bool starred) {} | 103 virtual void URLStarredChanged(TabContents* source, bool starred) {} |
103 virtual void UpdateTargetURL(TabContents* source, const GURL& url) {}; | 104 virtual void UpdateTargetURL(TabContents* source, const GURL& url) {}; |
104 | 105 |
105 TabContentsType type1() const { return factory1_->type(); } | 106 TabContentsType type1() const { return factory1_->type(); } |
106 TabContentsType type2() const { return factory2_->type(); } | 107 TabContentsType type2() const { return factory2_->type(); } |
107 | 108 |
108 const std::string& scheme1() const { return factory1_->scheme(); } | 109 const std::string& scheme1() const { return factory1_->scheme(); } |
109 const std::string& scheme2() const { return factory2_->scheme(); } | 110 const std::string& scheme2() const { return factory2_->scheme(); } |
110 | 111 |
(...skipping 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1556 | 1557 |
1557 helper_.AssertSingleWindowWithSingleTab(windows_, 2); | 1558 helper_.AssertSingleWindowWithSingleTab(windows_, 2); |
1558 helper_.AssertTabEquals(0, 1, 2, *(windows_[0]->tabs[0])); | 1559 helper_.AssertTabEquals(0, 1, 2, *(windows_[0]->tabs[0])); |
1559 | 1560 |
1560 TabNavigation nav(0, url0, GURL(), std::wstring(), std::string(), | 1561 TabNavigation nav(0, url0, GURL(), std::wstring(), std::string(), |
1561 PageTransition::LINK); | 1562 PageTransition::LINK); |
1562 helper_.AssertNavigationEquals(nav, windows_[0]->tabs[0]->navigations[0]); | 1563 helper_.AssertNavigationEquals(nav, windows_[0]->tabs[0]->navigations[0]); |
1563 nav.url = url2; | 1564 nav.url = url2; |
1564 helper_.AssertNavigationEquals(nav, windows_[0]->tabs[0]->navigations[1]); | 1565 helper_.AssertNavigationEquals(nav, windows_[0]->tabs[0]->navigations[1]); |
1565 } | 1566 } |
OLD | NEW |