Chromium Code Reviews| 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 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1594 const content::FileChooserParams& params) { | 1594 const content::FileChooserParams& params) { |
| 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 { |
|
Avi (use Gerrit)
2014/07/10 05:30:04
Is this a useful function if it always returns tru
miu
2014/07/10 06:20:16
Can't kill it. It's an override of WebContentsDel
Avi (use Gerrit)
2014/07/10 13:14:22
No problem.
| |
| 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 805 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2422 if (contents && !allow_js_access) { | 2421 if (contents && !allow_js_access) { |
| 2423 contents->web_contents()->GetController().LoadURL( | 2422 contents->web_contents()->GetController().LoadURL( |
| 2424 target_url, | 2423 target_url, |
| 2425 content::Referrer(), | 2424 content::Referrer(), |
| 2426 content::PAGE_TRANSITION_LINK, | 2425 content::PAGE_TRANSITION_LINK, |
| 2427 std::string()); // No extra headers. | 2426 std::string()); // No extra headers. |
| 2428 } | 2427 } |
| 2429 | 2428 |
| 2430 return contents != NULL; | 2429 return contents != NULL; |
| 2431 } | 2430 } |
| OLD | NEW |