| 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 1584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1595 FileSelectHelper::RunFileChooser(web_contents, params); | 1595 FileSelectHelper::RunFileChooser(web_contents, params); |
| 1596 } | 1596 } |
| 1597 | 1597 |
| 1598 void Browser::EnumerateDirectory(WebContents* web_contents, | 1598 void Browser::EnumerateDirectory(WebContents* web_contents, |
| 1599 int request_id, | 1599 int request_id, |
| 1600 const base::FilePath& path) { | 1600 const base::FilePath& path) { |
| 1601 FileSelectHelper::EnumerateDirectory(web_contents, request_id, path); | 1601 FileSelectHelper::EnumerateDirectory(web_contents, request_id, path); |
| 1602 } | 1602 } |
| 1603 | 1603 |
| 1604 bool Browser::EmbedsFullscreenWidget() const { | 1604 bool Browser::EmbedsFullscreenWidget() const { |
| 1605 return !CommandLine::ForCurrentProcess()-> | 1605 return true; |
| 1606 HasSwitch(switches::kDisableFullscreenWithinTab); | |
| 1607 } | 1606 } |
| 1608 | 1607 |
| 1609 void Browser::ToggleFullscreenModeForTab(WebContents* web_contents, | 1608 void Browser::ToggleFullscreenModeForTab(WebContents* web_contents, |
| 1610 bool enter_fullscreen) { | 1609 bool enter_fullscreen) { |
| 1611 fullscreen_controller_->ToggleFullscreenModeForTab(web_contents, | 1610 fullscreen_controller_->ToggleFullscreenModeForTab(web_contents, |
| 1612 enter_fullscreen); | 1611 enter_fullscreen); |
| 1613 } | 1612 } |
| 1614 | 1613 |
| 1615 bool Browser::IsFullscreenForTabOrPending( | 1614 bool Browser::IsFullscreenForTabOrPending( |
| 1616 const WebContents* web_contents) const { | 1615 const WebContents* web_contents) const { |
| (...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2441 if (contents && !allow_js_access) { | 2440 if (contents && !allow_js_access) { |
| 2442 contents->web_contents()->GetController().LoadURL( | 2441 contents->web_contents()->GetController().LoadURL( |
| 2443 target_url, | 2442 target_url, |
| 2444 content::Referrer(), | 2443 content::Referrer(), |
| 2445 content::PAGE_TRANSITION_LINK, | 2444 content::PAGE_TRANSITION_LINK, |
| 2446 std::string()); // No extra headers. | 2445 std::string()); // No extra headers. |
| 2447 } | 2446 } |
| 2448 | 2447 |
| 2449 return contents != NULL; | 2448 return contents != NULL; |
| 2450 } | 2449 } |
| OLD | NEW |