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 1732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1743 if (index == TabStripModel::kNoTab) { | 1743 if (index == TabStripModel::kNoTab) { |
1744 NOTREACHED(); | 1744 NOTREACHED(); |
1745 return; | 1745 return; |
1746 } | 1746 } |
1747 tab_strip_model_->SetTabBlocked(index, blocked); | 1747 tab_strip_model_->SetTabBlocked(index, blocked); |
1748 command_controller_->PrintingStateChanged(); | 1748 command_controller_->PrintingStateChanged(); |
1749 if (!blocked && chrome::GetActiveWebContents(this) == web_contents) | 1749 if (!blocked && chrome::GetActiveWebContents(this) == web_contents) |
1750 web_contents->Focus(); | 1750 web_contents->Focus(); |
1751 } | 1751 } |
1752 | 1752 |
| 1753 BrowserWindow* Browser::GetBrowserWindow() { |
| 1754 return window(); |
| 1755 } |
| 1756 |
1753 /////////////////////////////////////////////////////////////////////////////// | 1757 /////////////////////////////////////////////////////////////////////////////// |
1754 // Browser, BlockedContentTabHelperDelegate implementation: | 1758 // Browser, BlockedContentTabHelperDelegate implementation: |
1755 | 1759 |
1756 content::WebContents* Browser::GetConstrainingWebContents( | 1760 content::WebContents* Browser::GetConstrainingWebContents( |
1757 content::WebContents* source) { | 1761 content::WebContents* source) { |
1758 return source; | 1762 return source; |
1759 } | 1763 } |
1760 | 1764 |
1761 /////////////////////////////////////////////////////////////////////////////// | 1765 /////////////////////////////////////////////////////////////////////////////// |
1762 // Browser, BookmarkTabHelperDelegate implementation: | 1766 // Browser, BookmarkTabHelperDelegate implementation: |
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2303 if (contents && !allow_js_access) { | 2307 if (contents && !allow_js_access) { |
2304 contents->web_contents()->GetController().LoadURL( | 2308 contents->web_contents()->GetController().LoadURL( |
2305 target_url, | 2309 target_url, |
2306 content::Referrer(), | 2310 content::Referrer(), |
2307 content::PAGE_TRANSITION_LINK, | 2311 content::PAGE_TRANSITION_LINK, |
2308 std::string()); // No extra headers. | 2312 std::string()); // No extra headers. |
2309 } | 2313 } |
2310 | 2314 |
2311 return contents != NULL; | 2315 return contents != NULL; |
2312 } | 2316 } |
OLD | NEW |