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 // defined(OS_WIN) | 10 #endif // defined(OS_WIN) |
(...skipping 1767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1778 | 1778 |
1779 void Browser::SetTabContentBlocked(content::WebContents* web_contents, | 1779 void Browser::SetTabContentBlocked(content::WebContents* web_contents, |
1780 bool blocked) { | 1780 bool blocked) { |
1781 int index = tab_strip_model_->GetIndexOfWebContents(web_contents); | 1781 int index = tab_strip_model_->GetIndexOfWebContents(web_contents); |
1782 if (index == TabStripModel::kNoTab) { | 1782 if (index == TabStripModel::kNoTab) { |
1783 NOTREACHED(); | 1783 NOTREACHED(); |
1784 return; | 1784 return; |
1785 } | 1785 } |
1786 tab_strip_model_->SetTabBlocked(index, blocked); | 1786 tab_strip_model_->SetTabBlocked(index, blocked); |
1787 command_controller_->PrintingStateChanged(); | 1787 command_controller_->PrintingStateChanged(); |
| 1788 command_controller_->FullscreenStateChanged(); |
1788 if (!blocked && chrome::GetActiveWebContents(this) == web_contents) | 1789 if (!blocked && chrome::GetActiveWebContents(this) == web_contents) |
1789 web_contents->Focus(); | 1790 web_contents->Focus(); |
1790 } | 1791 } |
1791 | 1792 |
1792 bool Browser::GetConstrainedWindowTopCenter(gfx::Point* point) { | 1793 bool Browser::GetConstrainedWindowTopCenter(gfx::Point* point) { |
1793 int y = 0; | 1794 int y = 0; |
1794 if (window_->GetConstrainedWindowTopY(&y)) { | 1795 if (window_->GetConstrainedWindowTopY(&y)) { |
1795 *point = gfx::Point(window_->GetBounds().width() / 2, y); | 1796 *point = gfx::Point(window_->GetBounds().width() / 2, y); |
1796 return true; | 1797 return true; |
1797 } | 1798 } |
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2351 if (contents && !allow_js_access) { | 2352 if (contents && !allow_js_access) { |
2352 contents->web_contents()->GetController().LoadURL( | 2353 contents->web_contents()->GetController().LoadURL( |
2353 target_url, | 2354 target_url, |
2354 content::Referrer(), | 2355 content::Referrer(), |
2355 content::PAGE_TRANSITION_LINK, | 2356 content::PAGE_TRANSITION_LINK, |
2356 std::string()); // No extra headers. | 2357 std::string()); // No extra headers. |
2357 } | 2358 } |
2358 | 2359 |
2359 return contents != NULL; | 2360 return contents != NULL; |
2360 } | 2361 } |
OLD | NEW |