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

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

Issue 23477051: Embed Flash Fullscreen widget within browser window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add caution comment to chrome_switches.cc. Created 7 years, 3 months 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 | Annotate | Revision Log
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 1585 matching lines...) Expand 10 before | Expand all | Expand 10 after
1596 const content::FileChooserParams& params) { 1596 const content::FileChooserParams& params) {
1597 FileSelectHelper::RunFileChooser(web_contents, params); 1597 FileSelectHelper::RunFileChooser(web_contents, params);
1598 } 1598 }
1599 1599
1600 void Browser::EnumerateDirectory(WebContents* web_contents, 1600 void Browser::EnumerateDirectory(WebContents* web_contents,
1601 int request_id, 1601 int request_id,
1602 const base::FilePath& path) { 1602 const base::FilePath& path) {
1603 FileSelectHelper::EnumerateDirectory(web_contents, request_id, path); 1603 FileSelectHelper::EnumerateDirectory(web_contents, request_id, path);
1604 } 1604 }
1605 1605
1606 bool Browser::EmbedsFullscreenWidget() const {
1607 #if defined(TOOLKIT_GTK)
1608 // TODO(miu): On GTK, the balloon widget for Tab/HTML5 fullscreen needs to be
1609 // fixed before we can implement embedded fullscreen widgets.
1610 // http://crbug.com/286545
1611 return false;
1612 #else
1613 // TODO(miu): Make this feature switchable in about:flags?
1614 return CommandLine::ForCurrentProcess()->
1615 HasSwitch(switches::kEmbedFlashFullscreen);
1616 #endif
1617 }
1618
1606 void Browser::ToggleFullscreenModeForTab(WebContents* web_contents, 1619 void Browser::ToggleFullscreenModeForTab(WebContents* web_contents,
1607 bool enter_fullscreen) { 1620 bool enter_fullscreen) {
1608 fullscreen_controller_->ToggleFullscreenModeForTab(web_contents, 1621 fullscreen_controller_->ToggleFullscreenModeForTab(web_contents,
1609 enter_fullscreen); 1622 enter_fullscreen);
1610 } 1623 }
1611 1624
1612 bool Browser::IsFullscreenForTabOrPending( 1625 bool Browser::IsFullscreenForTabOrPending(
1613 const WebContents* web_contents) const { 1626 const WebContents* web_contents) const {
1614 return fullscreen_controller_->IsFullscreenForTabOrPending(web_contents); 1627 return fullscreen_controller_->IsFullscreenForTabOrPending(web_contents);
1615 } 1628 }
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
2300 if (contents && !allow_js_access) { 2313 if (contents && !allow_js_access) {
2301 contents->web_contents()->GetController().LoadURL( 2314 contents->web_contents()->GetController().LoadURL(
2302 target_url, 2315 target_url,
2303 content::Referrer(), 2316 content::Referrer(),
2304 content::PAGE_TRANSITION_LINK, 2317 content::PAGE_TRANSITION_LINK,
2305 std::string()); // No extra headers. 2318 std::string()); // No extra headers.
2306 } 2319 }
2307 2320
2308 return contents != NULL; 2321 return contents != NULL;
2309 } 2322 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698