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 "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1055 | 1055 |
1056 int Browser::GetIndexOfController( | 1056 int Browser::GetIndexOfController( |
1057 const NavigationController* controller) const { | 1057 const NavigationController* controller) const { |
1058 return tab_strip_model_->GetIndexOfController(controller); | 1058 return tab_strip_model_->GetIndexOfController(controller); |
1059 } | 1059 } |
1060 | 1060 |
1061 TabContents* Browser::GetActiveTabContents() const { | 1061 TabContents* Browser::GetActiveTabContents() const { |
1062 return tab_strip_model_->GetActiveTabContents(); | 1062 return tab_strip_model_->GetActiveTabContents(); |
1063 } | 1063 } |
1064 | 1064 |
1065 // DEPRECATED | |
1066 WebContents* Browser::GetSelectedWebContents() const { | |
1067 return GetActiveWebContents(); | |
1068 } | |
1069 | |
1070 WebContents* Browser::GetActiveWebContents() const { | 1065 WebContents* Browser::GetActiveWebContents() const { |
1071 TabContents* tab_contents = GetActiveTabContents(); | 1066 TabContents* tab_contents = GetActiveTabContents(); |
1072 return tab_contents ? tab_contents->web_contents() : NULL; | 1067 return tab_contents ? tab_contents->web_contents() : NULL; |
1073 } | 1068 } |
1074 | 1069 |
1075 TabContents* Browser::GetTabContentsAt(int index) const { | 1070 TabContents* Browser::GetTabContentsAt(int index) const { |
1076 return tab_strip_model_->GetTabContentsAt(index); | 1071 return tab_strip_model_->GetTabContentsAt(index); |
1077 } | 1072 } |
1078 | 1073 |
1079 WebContents* Browser::GetWebContentsAt(int index) const { | 1074 WebContents* Browser::GetWebContentsAt(int index) const { |
(...skipping 4119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5199 if (contents && !allow_js_access) { | 5194 if (contents && !allow_js_access) { |
5200 contents->web_contents()->GetController().LoadURL( | 5195 contents->web_contents()->GetController().LoadURL( |
5201 target_url, | 5196 target_url, |
5202 content::Referrer(), | 5197 content::Referrer(), |
5203 content::PAGE_TRANSITION_LINK, | 5198 content::PAGE_TRANSITION_LINK, |
5204 std::string()); // No extra headers. | 5199 std::string()); // No extra headers. |
5205 } | 5200 } |
5206 | 5201 |
5207 return contents != NULL; | 5202 return contents != NULL; |
5208 } | 5203 } |
OLD | NEW |