| 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 1722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1733 if (index == TabStripModel::kNoTab) { | 1733 if (index == TabStripModel::kNoTab) { |
| 1734 NOTREACHED(); | 1734 NOTREACHED(); |
| 1735 return; | 1735 return; |
| 1736 } | 1736 } |
| 1737 tab_strip_model_->SetTabBlocked(index, blocked); | 1737 tab_strip_model_->SetTabBlocked(index, blocked); |
| 1738 command_controller_->PrintingStateChanged(); | 1738 command_controller_->PrintingStateChanged(); |
| 1739 if (!blocked && chrome::GetActiveTabContents(this) == tab_contents) | 1739 if (!blocked && chrome::GetActiveTabContents(this) == tab_contents) |
| 1740 tab_contents->web_contents()->Focus(); | 1740 tab_contents->web_contents()->Focus(); |
| 1741 } | 1741 } |
| 1742 | 1742 |
| 1743 BrowserWindow* Browser::GetBrowserWindow() { |
| 1744 return window(); |
| 1745 } |
| 1746 |
| 1743 /////////////////////////////////////////////////////////////////////////////// | 1747 /////////////////////////////////////////////////////////////////////////////// |
| 1744 // Browser, BlockedContentTabHelperDelegate implementation: | 1748 // Browser, BlockedContentTabHelperDelegate implementation: |
| 1745 | 1749 |
| 1746 TabContents* Browser::GetConstrainingTabContents(TabContents* source) { | 1750 TabContents* Browser::GetConstrainingTabContents(TabContents* source) { |
| 1747 return source; | 1751 return source; |
| 1748 } | 1752 } |
| 1749 | 1753 |
| 1750 /////////////////////////////////////////////////////////////////////////////// | 1754 /////////////////////////////////////////////////////////////////////////////// |
| 1751 // Browser, BookmarkTabHelperDelegate implementation: | 1755 // Browser, BookmarkTabHelperDelegate implementation: |
| 1752 | 1756 |
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2282 if (contents && !allow_js_access) { | 2286 if (contents && !allow_js_access) { |
| 2283 contents->web_contents()->GetController().LoadURL( | 2287 contents->web_contents()->GetController().LoadURL( |
| 2284 target_url, | 2288 target_url, |
| 2285 content::Referrer(), | 2289 content::Referrer(), |
| 2286 content::PAGE_TRANSITION_LINK, | 2290 content::PAGE_TRANSITION_LINK, |
| 2287 std::string()); // No extra headers. | 2291 std::string()); // No extra headers. |
| 2288 } | 2292 } |
| 2289 | 2293 |
| 2290 return contents != NULL; | 2294 return contents != NULL; |
| 2291 } | 2295 } |
| OLD | NEW |