| 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 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1580 FileSelectHelper::RunFileChooser(web_contents, params); | 1580 FileSelectHelper::RunFileChooser(web_contents, params); |
| 1581 } | 1581 } |
| 1582 | 1582 |
| 1583 void Browser::EnumerateDirectory(WebContents* web_contents, | 1583 void Browser::EnumerateDirectory(WebContents* web_contents, |
| 1584 int request_id, | 1584 int request_id, |
| 1585 const base::FilePath& path) { | 1585 const base::FilePath& path) { |
| 1586 FileSelectHelper::EnumerateDirectory(web_contents, request_id, path); | 1586 FileSelectHelper::EnumerateDirectory(web_contents, request_id, path); |
| 1587 } | 1587 } |
| 1588 | 1588 |
| 1589 bool Browser::EmbedsFullscreenWidget() const { | 1589 bool Browser::EmbedsFullscreenWidget() const { |
| 1590 #if defined(TOOLKIT_GTK) | |
| 1591 return false; | |
| 1592 #else | |
| 1593 return !CommandLine::ForCurrentProcess()-> | 1590 return !CommandLine::ForCurrentProcess()-> |
| 1594 HasSwitch(switches::kDisableFullscreenWithinTab); | 1591 HasSwitch(switches::kDisableFullscreenWithinTab); |
| 1595 #endif | |
| 1596 } | 1592 } |
| 1597 | 1593 |
| 1598 void Browser::ToggleFullscreenModeForTab(WebContents* web_contents, | 1594 void Browser::ToggleFullscreenModeForTab(WebContents* web_contents, |
| 1599 bool enter_fullscreen) { | 1595 bool enter_fullscreen) { |
| 1600 fullscreen_controller_->ToggleFullscreenModeForTab(web_contents, | 1596 fullscreen_controller_->ToggleFullscreenModeForTab(web_contents, |
| 1601 enter_fullscreen); | 1597 enter_fullscreen); |
| 1602 } | 1598 } |
| 1603 | 1599 |
| 1604 bool Browser::IsFullscreenForTabOrPending( | 1600 bool Browser::IsFullscreenForTabOrPending( |
| 1605 const WebContents* web_contents) const { | 1601 const WebContents* web_contents) const { |
| (...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2412 if (contents && !allow_js_access) { | 2408 if (contents && !allow_js_access) { |
| 2413 contents->web_contents()->GetController().LoadURL( | 2409 contents->web_contents()->GetController().LoadURL( |
| 2414 target_url, | 2410 target_url, |
| 2415 content::Referrer(), | 2411 content::Referrer(), |
| 2416 content::PAGE_TRANSITION_LINK, | 2412 content::PAGE_TRANSITION_LINK, |
| 2417 std::string()); // No extra headers. | 2413 std::string()); // No extra headers. |
| 2418 } | 2414 } |
| 2419 | 2415 |
| 2420 return contents != NULL; | 2416 return contents != NULL; |
| 2421 } | 2417 } |
| OLD | NEW |