| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 1424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1435 // Two differences between this and FocusLocationBar(): | 1435 // Two differences between this and FocusLocationBar(): |
| 1436 // (1) This doesn't get recorded in user metrics, since it's called | 1436 // (1) This doesn't get recorded in user metrics, since it's called |
| 1437 // internally. | 1437 // internally. |
| 1438 // (2) This checks whether the location bar can be focused, and if not, clears | 1438 // (2) This checks whether the location bar can be focused, and if not, clears |
| 1439 // the focus. FocusLocationBar() is only reached when the location bar is | 1439 // the focus. FocusLocationBar() is only reached when the location bar is |
| 1440 // focusable, but this may be reached at other times, e.g. while in | 1440 // focusable, but this may be reached at other times, e.g. while in |
| 1441 // fullscreen mode, where we need to leave focus in a consistent state. | 1441 // fullscreen mode, where we need to leave focus in a consistent state. |
| 1442 window_->SetFocusToLocationBar(select_all); | 1442 window_->SetFocusToLocationBar(select_all); |
| 1443 } | 1443 } |
| 1444 | 1444 |
| 1445 void Browser::RenderWidgetShowing() { | |
| 1446 window_->DisableInactiveFrame(); | |
| 1447 } | |
| 1448 | |
| 1449 int Browser::GetExtraRenderViewHeight() const { | 1445 int Browser::GetExtraRenderViewHeight() const { |
| 1450 return window_->GetExtraRenderViewHeight(); | 1446 return window_->GetExtraRenderViewHeight(); |
| 1451 } | 1447 } |
| 1452 | 1448 |
| 1453 void Browser::ViewSourceForTab(WebContents* source, const GURL& page_url) { | 1449 void Browser::ViewSourceForTab(WebContents* source, const GURL& page_url) { |
| 1454 DCHECK(source); | 1450 DCHECK(source); |
| 1455 chrome::ViewSource(this, source); | 1451 chrome::ViewSource(this, source); |
| 1456 } | 1452 } |
| 1457 | 1453 |
| 1458 void Browser::ViewSourceForFrame(WebContents* source, | 1454 void Browser::ViewSourceForFrame(WebContents* source, |
| (...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2296 if (contents && !allow_js_access) { | 2292 if (contents && !allow_js_access) { |
| 2297 contents->web_contents()->GetController().LoadURL( | 2293 contents->web_contents()->GetController().LoadURL( |
| 2298 target_url, | 2294 target_url, |
| 2299 content::Referrer(), | 2295 content::Referrer(), |
| 2300 content::PAGE_TRANSITION_LINK, | 2296 content::PAGE_TRANSITION_LINK, |
| 2301 std::string()); // No extra headers. | 2297 std::string()); // No extra headers. |
| 2302 } | 2298 } |
| 2303 | 2299 |
| 2304 return contents != NULL; | 2300 return contents != NULL; |
| 2305 } | 2301 } |
| OLD | NEW |