Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 789533002: Fullscreen: make fullscreen requests come from RenderFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1632 matching lines...) Expand 10 before | Expand all | Expand 10 after
1643 int request_id, 1643 int request_id,
1644 const base::FilePath& path) { 1644 const base::FilePath& path) {
1645 FileSelectHelper::EnumerateDirectory(web_contents, request_id, path); 1645 FileSelectHelper::EnumerateDirectory(web_contents, request_id, path);
1646 } 1646 }
1647 1647
1648 bool Browser::EmbedsFullscreenWidget() const { 1648 bool Browser::EmbedsFullscreenWidget() const {
1649 return true; 1649 return true;
1650 } 1650 }
1651 1651
1652 void Browser::ToggleFullscreenModeForTab(WebContents* web_contents, 1652 void Browser::ToggleFullscreenModeForTab(WebContents* web_contents,
1653 const GURL& origin,
1653 bool enter_fullscreen) { 1654 bool enter_fullscreen) {
1654 fullscreen_controller_->ToggleFullscreenModeForTab(web_contents, 1655 fullscreen_controller_->ToggleFullscreenModeForTab(web_contents,
1656 origin,
1655 enter_fullscreen); 1657 enter_fullscreen);
1656 } 1658 }
1657 1659
1658 bool Browser::IsFullscreenForTabOrPending( 1660 bool Browser::IsFullscreenForTabOrPending(
1659 const WebContents* web_contents) const { 1661 const WebContents* web_contents) const {
1660 return fullscreen_controller_->IsFullscreenForTabOrPending(web_contents); 1662 return fullscreen_controller_->IsFullscreenForTabOrPending(web_contents);
1661 } 1663 }
1662 1664
1663 void Browser::RegisterProtocolHandler(WebContents* web_contents, 1665 void Browser::RegisterProtocolHandler(WebContents* web_contents,
1664 const std::string& protocol, 1666 const std::string& protocol,
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after
2524 if (contents && !allow_js_access) { 2526 if (contents && !allow_js_access) {
2525 contents->web_contents()->GetController().LoadURL( 2527 contents->web_contents()->GetController().LoadURL(
2526 target_url, 2528 target_url,
2527 content::Referrer(), 2529 content::Referrer(),
2528 ui::PAGE_TRANSITION_LINK, 2530 ui::PAGE_TRANSITION_LINK,
2529 std::string()); // No extra headers. 2531 std::string()); // No extra headers.
2530 } 2532 }
2531 2533
2532 return contents != NULL; 2534 return contents != NULL;
2533 } 2535 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698