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

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index c99c63fae6c0f9031e5aba28356c75398d822312..f65a5d5981bd595e5ed5bf2c6ab2113611856e9b 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -1296,8 +1296,12 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
// Make a new tab. Load the contents of this tab from the nib and associate
// the new controller with |contents| so it can be looked up later.
+ const BOOL autoEmbedFullscreen =
+ implicit_cast<content::WebContentsDelegate*>(browser_)->
+ EmbedsFullscreenWidget();
base::scoped_nsobject<TabContentsController> contentsController(
- [[TabContentsController alloc] initWithContents:contents]);
+ [[TabContentsController alloc] initWithContents:contents
+ andAutoEmbedFullscreen:autoEmbedFullscreen]);
[tabContentsArray_ insertObject:contentsController atIndex:index];
// Make a new tab and add it to the strip. Keep track of its controller.
@@ -1410,8 +1414,12 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
// Simply create a new TabContentsController for |newContents| and place it
// into the array, replacing |oldContents|. An ActiveTabChanged notification
// will follow, at which point we will install the new view.
+ const BOOL autoEmbedFullscreen =
+ implicit_cast<content::WebContentsDelegate*>(browser_)->
+ EmbedsFullscreenWidget();
base::scoped_nsobject<TabContentsController> newController(
- [[TabContentsController alloc] initWithContents:newContents]);
+ [[TabContentsController alloc] initWithContents:newContents
+ andAutoEmbedFullscreen:autoEmbedFullscreen]);
// Bye bye, |oldController|.
[tabContentsArray_ replaceObjectAtIndex:index withObject:newController];
« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm ('k') | chrome/browser/ui/fullscreen/fullscreen_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698